X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7c5d24856794b213573f5e67bf138db144dac2eb..725184f3bce66a3eff87cc3a01e5d96477a5d28a:/src/xbt/heap.c diff --git a/src/xbt/heap.c b/src/xbt/heap.c index 243e9c3212..7f97bd8e02 100644 --- a/src/xbt/heap.c +++ b/src/xbt/heap.c @@ -14,7 +14,7 @@ #include -/** @addtogroup XBT_heap +/** @addtogroup XBT_heap * \brief This section describes the API to generic heap with O(log(n)) access. */ @@ -45,7 +45,7 @@ void xbt_heap_free(xbt_heap_t H) 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; @@ -71,21 +71,22 @@ int xbt_heap_size(xbt_heap_t H) */ 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)); - } - - item = &(H->items[count - 1]); - item->key = key; - item->content = content; - xbt_heap_increaseKey(H, count - 1); - return; + 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)); + } + + item = &(H->items[count - 1]); + item->key = key; + item->content = content; + xbt_heap_increaseKey(H, count - 1); + return; } /** @@ -112,8 +113,7 @@ void *xbt_heap_pop(xbt_heap_t H) 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; } @@ -126,7 +126,7 @@ void *xbt_heap_pop(xbt_heap_t H) */ double xbt_heap_maxkey(xbt_heap_t H) { - xbt_assert0(H->count != 0,"Empty heap"); + xbt_assert0(H->count != 0, "Empty heap"); return KEY(H, 0); } @@ -139,13 +139,13 @@ double xbt_heap_maxkey(xbt_heap_t H) */ void *xbt_heap_maxcontent(xbt_heap_t H) { - xbt_assert0(H->count != 0,"Empty heap"); + xbt_assert0(H->count != 0, "Empty heap"); return CONTENT(H, 0); } /* <<<< 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) @@ -173,7 +173,7 @@ 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. */