- Small fixes
[tinc] / lib / rbl.c
index 88027e8..cf0316b 100644 (file)
--- a/lib/rbl.c
+++ b/lib/rbl.c
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: rbl.c,v 1.1.2.2 2000/11/18 18:14:57 guus Exp $
+    $Id: rbl.c,v 1.1.2.7 2000/11/19 22:12:46 guus Exp $
 */
 
+#include <xalloc.h>
+
+#include "rbl.h"
 
 /* Allocate a new rbl node */
 rbl_t *new_rbl()
 {
-  return (rbl_t *)xmalloc_and_zero(sizeof(*rbl));
+  return (rbl_t *)xmalloc_and_zero(sizeof(rbl_t));
 }
 
 /* Free a rbl node */
@@ -34,7 +37,7 @@ void free_rbl(rbl_t *rbl)
 }
 
 /* Allocate a new rbltree header */
-rbltree_t *new_rbltree(rbl_compare_t *compare, rbl_delete_t *delete)
+rbltree_t *new_rbltree(rbl_compare_t compare, rbl_action_t delete)
 {
   rbltree_t *tree;
 
@@ -55,18 +58,18 @@ void free_rbltree(rbltree_t *tree)
 }
 
 /* Search closest match in the tree */
-rbl_t rbl_search_closest(rbltree_t *tree, void *data)
+rbl_t *rbl_search_closest_rbl(rbltree_t *tree, void *data)
 {
   rbl_t *rbl, *next;
   int result;
   
-  next = rbl = tree->head;
+  next = rbl = tree->top;
   
   while(next)
     {
       rbl = next;
       
-      result = tree->compare(rbl->data, data);
+      result = tree->compare(data, rbl->data);
 
       if(result < 0)
         next = rbl->left;
@@ -79,19 +82,24 @@ rbl_t rbl_search_closest(rbltree_t *tree, void *data)
   return rbl;
 }
 
+void *rbl_search_closest(rbltree_t *tree, void *data)
+{
+  return rbl_search_closest_rbl(tree, data)->data;
+}
+
 /* Search exact match or return NULL pointer */
-rbl_t rbl_search(rbltree_t *tree, void *data)
+rbl_t *rbl_search_rbl(rbltree_t *tree, void *data)
 {
   rbl_t *rbl, *next;
   int result;
   
-  next = rbl = tree->head;
+  next = rbl = tree->top;
   
   while(next)
     {
       rbl = next;
       
-      result = tree->compare(rbl->data, data);
+      result = tree->compare(data, rbl->data);
 
       if(result < 0)
         next = rbl->left;
@@ -104,6 +112,18 @@ rbl_t rbl_search(rbltree_t *tree, void *data)
   return NULL;
 }
 
+void *rbl_search(rbltree_t *tree, void *data)
+{
+  rbl_t *rbl;
+
+  rbl = rbl_search_rbl(tree, data);
+
+  if(rbl)
+    return rbl->data;
+  else
+    return NULL;  
+}
+
 /* Red-black tree operations taken from Introduction to Algorithms,
    Cormen, Leiserson & Rivest, chapter 14.
 */
@@ -121,13 +141,13 @@ void rbl_left_rotate(rbl_t *x)
   y->parent = x->parent;
   
   if(!x->parent)
-    x->tree->head = y;
+    x->tree->top = y;
   else
     if(x == x->parent->left)
       x->parent->left = y;
     else
       x->parent->right = y;
-  
+
   y->left = x;
   x->parent = y;      
 }
@@ -135,7 +155,7 @@ void rbl_left_rotate(rbl_t *x)
 void rbl_right_rotate(rbl_t *y)
 {
   rbl_t *x;
-  
+
   x = y->left;
   y->left = x->right;
 
@@ -145,7 +165,7 @@ void rbl_right_rotate(rbl_t *y)
   x->parent = y->parent;
   
   if(!y->parent)
-    y->tree->head = x;
+    y->tree->top = x;
   else
     if(y == y->parent->right)
       y->parent->right = x;
@@ -157,118 +177,270 @@ void rbl_right_rotate(rbl_t *y)
 }
 
 /* Insert a node into the rbl tree */
-rbl_t rbl_insert_rbl(rbltree_t *tree, rbl_t *rbl)
+rbl_t *rbl_insert_rbl(rbltree_t *tree, rbl_t *rbl)
 {
-   rbl_t *closest, y;
-   int result;
+  rbl_t *closest, *x, *y;
+  int result;
   
+  rbl->tree = tree;
+
   /* Binary tree and linked list insert */
   
-  if(tree->head)
+  if(tree->top)
     {
-      closest = rbl_search_closest(tree, rbl->data);
-      result = tree->compare(rbl->data, data);
+      closest = rbl_search_closest_rbl(tree, rbl->data);
+      result = tree->compare(rbl->data, closest->data);
       if(result < 0)
         {
           closest->left = rbl;
+
           rbl->prev = closest->prev;
           rbl->next = closest;
           closest->prev = rbl;
-          rbl->prev->next = rbl;
+
+          if(rbl->prev)
+            rbl->prev->next = rbl;
+          else
+            tree->head = rbl;
         }
       else if(result > 0)
         {
           closest->right = rbl;
-          rbl->next = closest->right;
+
+          rbl->next = closest->next;
           rbl->prev = closest;
           closest->next = rbl;
-          rbl->next->prev = rbl;
+
+          if(rbl->next)
+            rbl->next->prev = rbl;
+          else
+            tree->tail = rbl;
         }
       else
         return closest;                /* Ofcourse, we cannot add two identical things */
+
+      rbl->parent = closest;
     }
   else
-    tree->head = rbl;
+    {
+      tree->top = rbl;
+      tree->head = rbl;
+      tree->tail = rbl;
+    }
 
   /* Red-black part of insert */
   
-  rbl->color = RBL_RED;
+  x = rbl;
+  x->color = RBL_RED;
   
-  while(rbl->parent && rbl->parent->color == RBL_RED)
+  while(x != tree->top && x->parent->color == RBL_RED)
     {
-      if(rbl->parent == rbl->parent->parent->left)
+      if(x->parent == x->parent->parent->left)
         {
-          y = rbl->parent->parent->right;
-          if(y->color == RBL_RED)
+          y = x->parent->parent->right;
+          if(y && y->color == RBL_RED)
             {
-              rbl->parent->color = RBL_BLACK;
+              x->parent->color = RBL_BLACK;
               y->color = RBL_BLACK;
-              rbl->parent->parent->color = RBL_RED;
-              rbl = rbl->parent->parent;
+              x->parent->parent->color = RBL_RED;
+              x = x->parent->parent;
             }
           else          
             {
-              if(rbl == rbl->parent->right)
+              if(x == x->parent->right)
                 {
-                  rbl = rbl->parent;
-                  rbl_left_rotate(rbl);
+                  x = x->parent;
+                  rbl_left_rotate(x);
                 }
-              rbl->parent->color = RBL_BLACK;
-              rbl->parent->parent->color = RBL_RED;
-              rbl_right_rotate(rbl->parent->parent);
+              x->parent->color = RBL_BLACK;
+              x->parent->parent->color = RBL_RED;
+              rbl_right_rotate(x->parent->parent);
             }
         }
       else
         {
-          y = rbl->parent->parent->left;
-          if(y->color == RBL_RED)
+          y = x->parent->parent->left;
+          if(y && y->color == RBL_RED)
             {
-              rbl->parent->color = RBL_BLACK;
+              x->parent->color = RBL_BLACK;
               y->color = RBL_BLACK;
-              rbl->parent->parent->color = RBL_RED;
-              rbl = rbl->parent->parent;
+              x->parent->parent->color = RBL_RED;
+              x = x->parent->parent;
             }
           else          
             {
-              if(rbl == rbl->parent->left)
+              if(x == x->parent->left)
                 {
-                  rbl = rbl->parent;
-                  rbl_right_rotate(rbl);
+                  x = x->parent;
+                  rbl_right_rotate(x);
                 }
-              rbl->parent->color = RBL_BLACK;
-              rbl->parent->parent->color = RBL_RED;
-              rbl_left_rotate(rbl->parent->parent);
+              x->parent->color = RBL_BLACK;
+              x->parent->parent->color = RBL_RED;
+              rbl_left_rotate(x->parent->parent);
             }
         }
     }
   
-  tree->head->color = RBL_BLACK;
-
+  tree->top->color = RBL_BLACK;
   return rbl;
 }
 
 /* Create a new node and insert it into the tree */
-rbl_t rbl_insert(rbltree_t *tree, void *data)
+rbl_t *rbl_insert(rbltree_t *tree, void *data)
 {
   rbl_t *rbl;
   
   rbl = new_rbl();
   rbl->data = data;
 
-  return rbl_insert_rbl(tree, rbl);
+  if(rbl_insert_rbl(tree, rbl) == rbl)
+    return rbl;
+  else
+    {
+      free_rbl(rbl);
+      return NULL;
+    }
 }
 
-/* Unlink node from the tree, but keep the node intact */
-rbl_t rbl_unlink_rbl(rbl_t *rbl)
+/* Restore red-black property after violation due to a deletion */
+void rbl_delete_fixup(rbl_t *x)
 {
+  rbl_t *w;
+  
+  while(x != x->tree->top && x->color == RBL_BLACK)
+    {
+      if(x == x->parent->left)
+        {
+          w = x->parent->right;
+          if(w->color == RBL_RED)
+            {
+              w->color = RBL_BLACK;
+              x->parent->color = RBL_RED;
+              rbl_left_rotate(x->parent);
+              w = x->parent->right;
+            }
+          if(w->left->color == RBL_BLACK && w->right->color == RBL_BLACK)
+            {
+              w->color = RBL_RED;
+              x = x->parent;
+            }
+          else
+            {
+              if(w->right->color == RBL_BLACK)
+                {
+                  w->left->color = RBL_BLACK;
+                  w->color = RBL_RED;
+                  rbl_right_rotate(w);
+                  w = x->parent->right;
+                }
+              w->color = x->parent->color;
+              x->parent->color = RBL_BLACK;
+              w->right->color = RBL_BLACK;
+              rbl_left_rotate(x->parent);
+              x = x->tree->top;
+            }
+        }
+      else
+        {
+          w = x->parent->left;
+          if(w->color == RBL_RED)
+            {
+              w->color = RBL_BLACK;
+              x->parent->color = RBL_RED;
+              rbl_right_rotate(x->parent);
+              w = x->parent->left;
+            }
+          if(w->right->color == RBL_BLACK && w->left->color == RBL_BLACK)
+            {
+              w->color = RBL_RED;
+              x = x->parent;
+            }
+          else
+            {
+              if(w->left->color == RBL_BLACK)
+                {
+                  w->right->color = RBL_BLACK;
+                  w->color = RBL_RED;
+                  rbl_left_rotate(w);
+                  w = x->parent->left;
+                }
+              w->color = x->parent->color;
+              x->parent->color = RBL_BLACK;
+              w->left->color = RBL_BLACK;
+              rbl_right_rotate(x->parent);
+              x = x->tree->top;
+            }
+        }
+    }
+  
+  x->color = RBL_BLACK;
+}
+
+/* Unlink node from the tree, but keep the node intact. */
+rbl_t *rbl_unlink_rbl(rbl_t *rbl)
+{
+  rbl_t *x, *y;
+
+  /* Binary tree delete */
+
+  if(rbl->left && rbl->right)
+    y = rbl->next;
+  else
+    y = rbl;
+    
+  if(y->left)
+    x = y->left;
+  else
+    x = y->right;
+    
+  if(x)
+    x->parent = y->parent;
+    
+  if(!y->parent)
+    rbl->tree->top = x;
+  else
+    if(y == y->parent->left)
+      y->parent->left = x;
+    else
+      y->parent->right = x;
+  
+  if(y != rbl)
+    {
+      y->left = rbl->left;
+      y->right = rbl->right;
+      y->parent = rbl->parent;
+      if(rbl == rbl->parent->left)
+        rbl->parent->left = y;
+      else
+        rbl->parent->right = y;
+    }
+
+  /* Linked list delete */
+  
+  if(rbl->prev)
+    rbl->prev->next = rbl->next;
+  else
+    rbl->tree->head = rbl->next;
+  
+  if(rbl->next)
+    rbl->next->prev = rbl->prev;
+  else
+    rbl->tree->tail = rbl->prev;
+
+  /* Red-black part of delete */
+  
+  if(y->color == RBL_BLACK && x)
+    rbl_delete_fixup(x);
+    
+  return rbl;
 }
 
 /* Search node in tree and unlink it */
-rbl_t rbl_unlink(rbltree_t *tree, void *data)
+rbl_t *rbl_unlink(rbltree_t *tree, void *data)
 {
   rbl_t *rbl;
   
-  rbl = rbl_search(tree, data);
+  rbl = rbl_search_rbl(tree, data);
   
   if(rbl)
     return rbl_unlink_rbl(rbl);
@@ -287,3 +459,82 @@ void rbl_delete(rbltree_t *tree, void *data)
 {
   free_rbl(rbl_unlink(tree, data));
 }
+
+rbl_unlink_rbltree_branch(rbl_t *rbl)
+{
+  if(rbl->left)
+    rbl_unlink_rbltree_branch(rbl->left);
+
+  if(rbl->right)
+    rbl_unlink_rbltree_branch(rbl->right);
+
+  if(rbl->parent)
+    {
+      if(rbl == rbl->parent->left)
+        rbl->parent->left = NULL;
+      else
+        rbl->parent->right = NULL;
+    }
+}
+
+/* Optimized unlinking for a complete tree */
+void rbl_unlink_rbltree(rbltree_t *tree)
+{
+  rbl_t *rbl, *next;
+  
+  for(rbl = tree->head; rbl; rbl = next)
+    {
+      next = rbl->next;
+      rbl->tree = NULL;
+      rbl->parent = NULL;
+      rbl->left = NULL;
+      rbl->right = NULL;
+      rbl->prev = NULL;
+      rbl->next = NULL;
+    }
+    
+  tree->top = NULL;
+  tree->head = NULL;
+  tree->tail = NULL;
+}
+
+/* Optimized deletion for a complete tree */
+void rbl_delete_rbltree(rbltree_t *tree)
+{
+  rbl_t *rbl, *next;
+  
+  for(rbl = tree->head; rbl; rbl = next)
+    {
+      next = rbl->next;
+      tree->delete(rbl->data);
+    }
+
+  tree->top = NULL;
+  tree->head = NULL;
+  tree->tail = NULL;
+}
+
+/* Do action for each list entry (in order)
+   Deletion of entry for which action is called is allowed.
+ */
+void rbl_foreach(rbltree_t *tree, rbl_action_t action)
+{
+  rbl_t *rbl, *next;
+  
+  for(rbl = tree->head; rbl; rbl = next)
+    {
+      next = rbl->next;
+      action(rbl->data);
+    }
+}
+
+void rbl_foreach_rbl(rbltree_t *tree, rbl_action_rbl_t action)
+{
+  rbl_t *rbl, *next;
+  
+  for(rbl = tree->head; rbl; rbl = next)
+    {
+      next = rbl->next;
+      action(rbl);
+    }
+}