/* 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:
*/
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));
+ 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;
}
{
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);
- 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
*/
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);
*/
xbt_heap_float_t xbt_heap_maxkey(xbt_heap_t H)
{
+ if(H->count==0) abort();
return KEY(H, 0);
}
*/
void *xbt_heap_maxcontent(xbt_heap_t H)
{
+ if(H->count==0) abort();
return CONTENT(H, 0);
}
*
* 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) {
* 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];