Rha!

[simgrid.git] / src / xbt / heap.c

diff --git a/src/xbt/heap.c b/src/xbt/heap.c
index dae1a12..e30291f 100644 (file)
--- a/src/xbt/heap.c
+++ b/src/xbt/heap.c
@@ -8,6 +8,7 @@
 #include "xbt/sysdep.h"
 #include "xbt/error.h"
 #include "heap_private.h"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(heap,xbt,"Heap");
 
 /**
  * xbt_heap_new:
@@ -36,13 +37,24 @@ void xbt_heap_free(xbt_heap_t H)
 {
   int i;
   if (H->free)
-    for (i = 0; i < H->size; i++)
+    for (i = 0; i < H->count; i++)
       H->free(H->items[i].content);
   xbt_free(H->items);
   xbt_free(H);
   return;
 }
 
+/**
+ * xbt_heap_size:
+ * @H: the heap we're working on
+ *
+ * returns the number of elements in the heap
+ */
+int xbt_heap_size(xbt_heap_t H)
+{
+  return (H->count);
+}
+
 /**
  * xbt_heap_push:
  * @H: the heap we're working on
@@ -80,7 +92,12 @@ void xbt_heap_push(xbt_heap_t H, void *content, xbt_heap_float_t key)
  */
 void *xbt_heap_pop(xbt_heap_t H)
 {
-  void *max = CONTENT(H, 0);
+  void *max ;
+
+  if(H->count==0) return NULL;
+
+  max = CONTENT(H, 0);
+
   H->items[0] = H->items[(H->count) - 1];
   (H->count)--;
   xbt_heap_maxHeapify(H);
@@ -101,6 +118,7 @@ void *xbt_heap_pop(xbt_heap_t H)
  */
 xbt_heap_float_t xbt_heap_maxkey(xbt_heap_t H)
 {
+  if(H->count==0) abort();
   return KEY(H, 0);
 }
 
@@ -113,6 +131,7 @@ xbt_heap_float_t xbt_heap_maxkey(xbt_heap_t H)
  */
 void *xbt_heap_maxcontent(xbt_heap_t H)
 {
+  if(H->count==0) abort();
   return CONTENT(H, 0);
 }