#include "xbt/log.h"
#include "heap_private.h"
+#include <stdio.h>
-/** @addtogroup XBT_heap
+
+/** @addtogroup XBT_heap
* \brief This section describes the API to generic heap with O(log(n)) access.
*/
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(heap, xbt, "Heap");
-
/**
* @brief Creates a new heap.
* \param init_size initial size of the heap
*
* Creates a new heap.
*/
-xbt_heap_t xbt_heap_new(int init_size, void_f_pvoid_t * const free_func)
+xbt_heap_t xbt_heap_new(int init_size, void_f_pvoid_t const free_func)
{
xbt_heap_t H = xbt_new0(struct xbt_heap, 1);
H->size = init_size;
int i;
if (H->free)
for (i = 0; i < H->count; i++)
- H->free(H->items[i].content);
+ (*(H->free))(H->items[i].content);
free(H->items);
free(H);
return;
void xbt_heap_push(xbt_heap_t H, void *content, double key)
{
int count = ++(H->count);
+
int size = H->size;
xbt_heapItem_t item;
+
if (count > size) {
H->size = 2 * size + 1;
- H->items =
- (void *) realloc(H->items,
- (H->size) * sizeof(struct xbt_heapItem));
+ H->items =(void *) realloc(H->items,(H->size) * sizeof(struct xbt_heapItem));
}
+
item = &(H->items[count - 1]);
item->key = key;
item->content = content;
if (H->count < H->size / 4 && H->size > 16) {
H->size = H->size / 2 + 1;
H->items =
- (void *) realloc(H->items,
- (H->size) * sizeof(struct xbt_heapItem));
+ (void *) realloc(H->items,
+ (H->size) * sizeof(struct xbt_heapItem));
}
return max;
}
/* <<<< private >>>>
* \param H the heap we're working on
- *
+ *
* Restores the heap property once an element has been deleted.
*/
static void xbt_heap_maxHeapify(xbt_heap_t H)
/* <<<< private >>>>
* \param H the heap we're working on
* \param i an item position in the heap
- *
+ *
* Moves up an item at position i to its correct position. Works only
* when called from xbt_heap_push. Do not use otherwise.
*/