/**
* @brief Creates a new heap.
* \param init_size initial size of the heap
- * \param free_func function to call on each element when you want to free
- * the whole heap (or NULL if nothing to do).
+ * \param free_func function to call on each element when you want to free the whole heap (or NULL if nothing to do).
*
* Creates a new heap.
*/
-XBT_INLINE xbt_heap_t xbt_heap_new(int init_size,
- void_f_pvoid_t const free_func)
+inline 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;
* @param H the heap we're working on
* \param update_callback function to call on each element to update its index when needed.
*/
-XBT_INLINE void xbt_heap_set_update_callback(xbt_heap_t H,
- void (*update_callback) (void
- *,
- int))
+inline void xbt_heap_set_update_callback(xbt_heap_t H, void (*update_callback) (void*, int))
{
H->update_callback = update_callback;
}
-
/**
* @brief kilkil a heap and its content
* @param H poor victim
*/
void xbt_heap_free(xbt_heap_t H)
{
- int i;
+ if (!H)
+ return;
+
if (H->free)
- for (i = 0; i < H->count; i++)
+ for (int i = 0; i < H->count; i++)
H->free(H->items[i].content);
free(H->items);
free(H);
- return;
}
/**
* @param H the heap we're working on
* @return the number of elements in the heap
*/
-XBT_INLINE int xbt_heap_size(xbt_heap_t H)
+inline int xbt_heap_size(xbt_heap_t H)
{
return (H->count);
}
if (count > size) {
H->size = (size << 1) + 1;
- H->items =
- (void *) xbt_realloc(H->items,
- (H->size) * sizeof(struct xbt_heap_item));
+ H->items = (void *) xbt_realloc(H->items, (H->size) * sizeof(struct xbt_heap_item));
}
item = &(H->items[count - 1]);
item->content = content;
xbt_heap_increase_key(H, count - 1);
XBT_DEBUG("Heap has now %d elements and max elem is %g",xbt_heap_size(H),xbt_heap_maxkey(H));
- return;
}
/**
* \param H the heap we're working on
* \return the element with the smallest key
*
- * Extracts from the heap and returns the element with the smallest
- * key. The element with the next smallest key is automatically moved
- * at the top of the heap.
+ * Extracts from the heap and returns the element with the smallest key. The element with the next smallest key is
+ * automatically moved at the top of the heap.
*/
void *xbt_heap_pop(xbt_heap_t H)
{
xbt_heap_max_heapify(H,0);
if (H->count < size >> 2 && size > 16) {
size = (size >> 1) + 1;
- H->items =
- (void *) xbt_realloc(items,
- size * sizeof(struct xbt_heap_item));
+ H->items = (void *) xbt_realloc(items, size * sizeof(struct xbt_heap_item));
H->size = size;
}
* \param i element position
* \return the element at position i if ok, NULL otherwise
*
- * Extracts from the heap and returns the element at position i. The heap is automatically reorded.
+ * Extracts from the heap and returns the element at position i. The heap is automatically reordered.
*/
void *xbt_heap_remove(xbt_heap_t H, int i)
{
*
* \return the smallest key in the heap without modifying the heap.
*/
-XBT_INLINE double xbt_heap_maxkey(xbt_heap_t H)
+inline double xbt_heap_maxkey(xbt_heap_t H)
{
xbt_assert(H->count != 0, "Empty heap");
return KEY(H, 0);
* \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.
+ * Moves up an item at position i to its correct position. Works only when called from xbt_heap_push.
+ * Do not use otherwise.
*/
static void xbt_heap_increase_key(xbt_heap_t H, int i)
{
}
if (H->update_callback)
H->update_callback(items[i].content, i);
- return;
}
