X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fprio_heap.h;h=347a2ced5fa302482878fd75160c0aa61c17c1b4;hp=51cdac56c26d693a9a655f2318c8b81d3e2c67b8;hb=23a151f0f9301b6fee28c9b0e8301f1f50e4ef9b;hpb=1eb0c69cf759f535b1a926e667ae3f3aed486c9f diff --git a/include/babeltrace/prio_heap.h b/include/babeltrace/prio_heap.h index 51cdac56..347a2ced 100644 --- a/include/babeltrace/prio_heap.h +++ b/include/babeltrace/prio_heap.h @@ -21,6 +21,7 @@ */ #include +#include struct ptr_heap { size_t len, alloc_len; @@ -28,6 +29,15 @@ struct ptr_heap { int (*gt)(void *a, void *b); }; +#ifdef DEBUG_HEAP +void check_heap(const struct ptr_heap *heap); +#else +static inline +void check_heap(const struct ptr_heap *heap) +{ +} +#endif + /** * heap_maximum - return the largest element in the heap * @heap: the heap to be operated on @@ -37,7 +47,8 @@ struct ptr_heap { */ static inline void *heap_maximum(const struct ptr_heap *heap) { - return heap->len ? heap->ptrs[0] : NULL; + check_heap(heap); + return likely(heap->len) ? heap->ptrs[0] : NULL; } /** @@ -103,4 +114,13 @@ extern void *heap_cherrypick(struct ptr_heap *heap, void *p); */ extern void *heap_replace_max(struct ptr_heap *heap, void *p); +/** + * heap_copy - copy a heap + * @dst: the destination heap (must be allocated) + * @src: the source heap + * + * Returns -ENOMEM if out of memory. + */ +extern int heap_copy(struct ptr_heap *dst, struct ptr_heap *src); + #endif /* _BABELTRACE_PRIO_HEAP_H */