Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+#include <babeltrace/babeltrace-internal.h>
struct ptr_heap {
size_t len, alloc_len;
struct ptr_heap {
size_t len, alloc_len;
static inline void *heap_maximum(const struct ptr_heap *heap)
{
check_heap(heap);
static inline void *heap_maximum(const struct ptr_heap *heap)
{
check_heap(heap);
- return heap->len ? heap->ptrs[0] : NULL;
+ return likely(heap->len) ? heap->ptrs[0] : NULL;
*/
#include <babeltrace/prio_heap.h>
*/
#include <babeltrace/prio_heap.h>
+#include <babeltrace/babeltrace-internal.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
- if (heap->alloc_len >= new_len)
+ if (likely(heap->alloc_len >= new_len))
return 0;
heap->alloc_len = max_t(size_t, new_len, heap->alloc_len << 1);
new_ptrs = calloc(heap->alloc_len, sizeof(void *));
return 0;
heap->alloc_len = max_t(size_t, new_len, heap->alloc_len << 1);
new_ptrs = calloc(heap->alloc_len, sizeof(void *));
+ if (unlikely(!new_ptrs))
+ if (likely(heap->ptrs))
memcpy(new_ptrs, heap->ptrs, heap->len * sizeof(void *));
free(heap->ptrs);
heap->ptrs = new_ptrs;
memcpy(new_ptrs, heap->ptrs, heap->len * sizeof(void *));
free(heap->ptrs);
heap->ptrs = new_ptrs;
int ret;
ret = heap_grow(heap, new_len);
int ret;
ret = heap_grow(heap, new_len);
return ret;
heap->len = new_len;
return 0;
return ret;
heap->len = new_len;
return 0;
largest = i;
if (r < heap->len && heap->gt(ptrs[r], ptrs[largest]))
largest = r;
largest = i;
if (r < heap->len && heap->gt(ptrs[r], ptrs[largest]))
largest = r;
+ if (unlikely(largest == i))
break;
tmp = ptrs[i];
ptrs[i] = ptrs[largest];
break;
tmp = ptrs[i];
ptrs[i] = ptrs[largest];
+ if (unlikely(!heap->len)) {
(void) heap_set_len(heap, 1);
heap->ptrs[0] = p;
check_heap(heap);
(void) heap_set_len(heap, 1);
heap->ptrs[0] = p;
check_heap(heap);
int ret;
ret = heap_set_len(heap, heap->len + 1);
int ret;
ret = heap_set_len(heap, heap->len + 1);
return ret;
ptrs = heap->ptrs;
pos = heap->len - 1;
return ret;
ptrs = heap->ptrs;
pos = heap->len - 1;
size_t pos, len = heap->len;
for (pos = 0; pos < len; pos++)
size_t pos, len = heap->len;
for (pos = 0; pos < len; pos++)
- if (heap->ptrs[pos] == p)
+ if (unlikely(heap->ptrs[pos] == p))
goto found;
return NULL;
found:
goto found;
return NULL;
found:
+ if (unlikely(heap->len == 1)) {
(void) heap_set_len(heap, 0);
check_heap(heap);
return heap->ptrs[0];
(void) heap_set_len(heap, 0);
check_heap(heap);
return heap->ptrs[0];