1 files changed, 58 insertions, 2 deletions

diff --git a/litmus/binheap.c b/litmus/binheap.c
index f76260e64b0b..22feea614e50 100644
--- a/litmus/binheap.c
+++ b/litmus/binheap.c
@@ -1,5 +1,7 @@
 #include <litmus/binheap.h>
 
+//extern void dump_node_data(struct binheap_node* parent, struct binheap_node* child);
+//extern void dump_node_data2(struct binheap_handle *handle, struct binheap_node* bad_node);
 
 int binheap_is_in_this_heap(struct binheap_node *node,
         struct binheap_handle* heap)
@@ -29,6 +31,11 @@ static void __update_ref(struct binheap_node *parent,
 static void __binheap_swap(struct binheap_node *parent,
         struct binheap_node *child)
 {
+//      if(parent == BINHEAP_POISON || child == BINHEAP_POISON) {
+//              dump_node_data(parent, child);
+//              BUG();
+//      }
+        
         swap(parent->data, child->data);
         __update_ref(parent, child);
 }
@@ -185,12 +192,24 @@ static void __binheap_bubble_up(
         struct binheap_handle *handle,
         struct binheap_node *node)
 {
-        /* Note: NULL data pointers are used internally for arbitrary delete */
+        //BUG_ON(!binheap_is_in_heap(node));
+//      if(!binheap_is_in_heap(node))
+//      {
+//              dump_node_data2(handle, node);
+//              BUG();
+//      }
+        
         while((node->parent != NULL) &&
                   ((node->data == BINHEAP_POISON) /* let BINHEAP_POISON data bubble to the top */ ||
                    handle->compare(node, node->parent))) {
                           __binheap_swap(node->parent, node);
                           node = node->parent;
+                          
+//                        if(!binheap_is_in_heap(node))
+//                        {
+//                                dump_node_data2(handle, node);
+//                                BUG();
+//                        }
         }
 }
 
@@ -228,6 +247,12 @@ void __binheap_add(struct binheap_node *new_node,
         struct binheap_handle *handle,
         void *data)
 {
+//      if(binheap_is_in_heap(new_node))
+//      {
+//              dump_node_data2(handle, new_node);
+//              BUG();
+//      }
+        
         new_node->data = data;
         new_node->ref = new_node;
         new_node->ref_ptr = &(new_node->ref);
@@ -284,6 +309,12 @@ void __binheap_delete_root(struct binheap_handle *handle,
 {
         struct binheap_node *root = handle->root;
         
+//      if(!binheap_is_in_heap(container))
+//      {
+//              dump_node_data2(handle, container);
+//              BUG();
+//      }
+        
         if(root != container) {
                 /* coalesce */
                 __binheap_swap_safe(handle, root, container);
@@ -366,6 +397,18 @@ void __binheap_delete(struct binheap_node *node_to_delete,
         struct binheap_node *target = node_to_delete->ref;
         void *temp_data = target->data;
         
+//      if(!binheap_is_in_heap(node_to_delete))
+//      {
+//              dump_node_data2(handle, node_to_delete);
+//              BUG();
+//      }       
+//      
+//      if(!binheap_is_in_heap(target))
+//      {
+//              dump_node_data2(handle, target);
+//              BUG();
+//      }
+        
         /* temporarily set data to null to allow node to bubble up to the top. */
         target->data = BINHEAP_POISON;
         
@@ -373,7 +416,7 @@ void __binheap_delete(struct binheap_node *node_to_delete,
         __binheap_delete_root(handle, node_to_delete);
         
         node_to_delete->data = temp_data;  /* restore node data pointer */
-        node_to_delete->parent = BINHEAP_POISON; /* poison the node */
+        //node_to_delete->parent = BINHEAP_POISON; /* poison the node */
 }
 
 /**
@@ -383,5 +426,18 @@ void __binheap_decrease(struct binheap_node *orig_node,
         struct binheap_handle *handle)
 {
         struct binheap_node *target = orig_node->ref;
+        
+//      if(!binheap_is_in_heap(orig_node))
+//      {
+//              dump_node_data2(handle, orig_node);
+//              BUG();
+//      }       
+//      
+//      if(!binheap_is_in_heap(target))
+//      {
+//              dump_node_data2(handle, target);
+//              BUG();
+//      }
+//      
         __binheap_bubble_up(handle, target);
 }