Rha!

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

diff --git a/src/xbt/heap.c b/src/xbt/heap.c
index 917cd6c..e30291f 100644 (file)
--- a/src/xbt/heap.c
+++ b/src/xbt/heap.c
@@ -5,7 +5,10 @@
 /* This program is free software; you can redistribute it and/or modify it
    under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "xbt_heap_private.h"
+#include "xbt/sysdep.h"
+#include "xbt/error.h"
+#include "heap_private.h"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(heap,xbt,"Heap");
 
 /**
  * xbt_heap_new:
@@ -16,11 +19,11 @@
  */
 xbt_heap_t xbt_heap_new(int init_size, void_f_pvoid_t * const free_func)
 {
-  xbt_heap_t H = calloc(1, sizeof(struct xbt_heap));
-  H->size  = init_size;
+  xbt_heap_t H = xbt_new0(struct xbt_heap, 1);
+  H->size = init_size;
   H->count = 0;
-  H->items = (xbt_heapItem_t) calloc(init_size, sizeof(struct xbt_heapItem));
-  H->free  = free;
+  H->items = (xbt_heapItem_t) xbt_new0(struct xbt_heapItem, init_size);
+  H->free = free_func;
   return H;
 }
 
@@ -32,15 +35,26 @@ xbt_heap_t xbt_heap_new(int init_size, void_f_pvoid_t * const free_func)
  */
 void xbt_heap_free(xbt_heap_t H)
 {
-  int i ;
-  if(H->free)
-    for(i=0;i < H->size;i++) 
+  int i;
+  if (H->free)
+    for (i = 0; i < H->count; i++)
       H->free(H->items[i].content);
-  free(H->items);
-  free(H);
+  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
@@ -78,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);
@@ -99,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);
 }
 
@@ -111,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);
 }
 
@@ -120,10 +141,10 @@ void *xbt_heap_maxcontent(xbt_heap_t H)
  * 
  * Restores the heap property once an element has been deleted.
  */
-void xbt_heap_maxHeapify(xbt_heap_t H)
+static void xbt_heap_maxHeapify(xbt_heap_t H)
 {
-  int i=0;
-  while(1) {
+  int i = 0;
+  while (1) {
     int greatest = i;
     int l = LEFT(i);
     int r = RIGHT(i);
@@ -136,8 +157,9 @@ void xbt_heap_maxHeapify(xbt_heap_t H)
       struct xbt_heapItem tmp = H->items[i];
       H->items[i] = H->items[greatest];
       H->items[greatest] = tmp;
-      i=greatest;
-    } else return;
+      i = greatest;
+    } else
+      return;
   }
 }
 
@@ -149,7 +171,7 @@ void xbt_heap_maxHeapify(xbt_heap_t H)
  * Moves up an item at position i to its correct position. Works only
  * when called from xbt_heap_push. Do not use otherwise.
  */
-void xbt_heap_increaseKey(xbt_heap_t H, int i)
+static void xbt_heap_increaseKey(xbt_heap_t H, int i)
 {
   while (i > 0 && KEY(H, PARENT(i)) > KEY(H, i)) {
     struct xbt_heapItem tmp = H->items[i];