projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
namespace the heap functions
[babeltrace.git]
/
lib
/
iterator.c
diff --git
a/lib/iterator.c
b/lib/iterator.c
index 41a46020f6c690b4cc253044d845c0919e34cf0f..dc12a2f41020d34fa4903bc61494bddb092e53c7 100644
(file)
--- a/
lib/iterator.c
+++ b/
lib/iterator.c
@@
-180,7
+180,7
@@
static int seek_ctf_trace_by_timestamp(struct ctf_trace *tin,
ret = seek_file_stream_by_timestamp(cfs, timestamp);
if (ret == 0) {
/* Add to heap */
ret = seek_file_stream_by_timestamp(cfs, timestamp);
if (ret == 0) {
/* Add to heap */
- ret = heap_insert(stream_heap, cfs);
+ ret =
bt_
heap_insert(stream_heap, cfs);
if (ret) {
/* Return positive error. */
return -ret;
if (ret) {
/* Return positive error. */
return -ret;
@@
-358,8
+358,8
@@
int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
if (!iter_pos->u.restore)
return -EINVAL;
if (!iter_pos->u.restore)
return -EINVAL;
- heap_free(iter->stream_heap);
- ret = heap_init(iter->stream_heap, 0, stream_compare);
+
bt_
heap_free(iter->stream_heap);
+ ret =
bt_
heap_init(iter->stream_heap, 0, stream_compare);
if (ret < 0)
goto error_heap_init;
if (ret < 0)
goto error_heap_init;
@@
-404,7
+404,7
@@
int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
}
/* Add to heap */
}
/* Add to heap */
- ret = heap_insert(iter->stream_heap,
+ ret =
bt_
heap_insert(iter->stream_heap,
saved_pos->file_stream);
if (ret)
goto error;
saved_pos->file_stream);
if (ret)
goto error;
@@
-413,8
+413,8
@@
int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
case BT_SEEK_TIME:
tc = iter->ctx->tc;
case BT_SEEK_TIME:
tc = iter->ctx->tc;
- heap_free(iter->stream_heap);
- ret = heap_init(iter->stream_heap, 0, stream_compare);
+
bt_
heap_free(iter->stream_heap);
+ ret =
bt_
heap_init(iter->stream_heap, 0, stream_compare);
if (ret < 0)
goto error_heap_init;
if (ret < 0)
goto error_heap_init;
@@
-444,8
+444,8
@@
int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
return 0;
case BT_SEEK_BEGIN:
tc = iter->ctx->tc;
return 0;
case BT_SEEK_BEGIN:
tc = iter->ctx->tc;
- heap_free(iter->stream_heap);
- ret = heap_init(iter->stream_heap, 0, stream_compare);
+
bt_
heap_free(iter->stream_heap);
+ ret =
bt_
heap_init(iter->stream_heap, 0, stream_compare);
if (ret < 0)
goto error_heap_init;
if (ret < 0)
goto error_heap_init;
@@
-487,7
+487,7
@@
int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
/* Do not add EOF streams */
continue;
}
/* Do not add EOF streams */
continue;
}
- ret = heap_insert(iter->stream_heap, file_stream);
+ ret =
bt_
heap_insert(iter->stream_heap, file_stream);
if (ret)
goto error;
}
if (ret)
goto error;
}
@@
-503,13
+503,13
@@
int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
if (ret != 0 || !cfs)
goto error;
/* remove all streams from the heap */
if (ret != 0 || !cfs)
goto error;
/* remove all streams from the heap */
- heap_free(iter->stream_heap);
+
bt_
heap_free(iter->stream_heap);
/* Create a new empty heap */
/* Create a new empty heap */
- ret = heap_init(iter->stream_heap, 0, stream_compare);
+ ret =
bt_
heap_init(iter->stream_heap, 0, stream_compare);
if (ret < 0)
goto error;
/* Insert the stream that contains the last event */
if (ret < 0)
goto error;
/* Insert the stream that contains the last event */
- ret = heap_insert(iter->stream_heap, cfs);
+ ret =
bt_
heap_insert(iter->stream_heap, cfs);
if (ret)
goto error;
break;
if (ret)
goto error;
break;
@@
-522,10
+522,10
@@
int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
return 0;
error:
return 0;
error:
- heap_free(iter->stream_heap);
+
bt_
heap_free(iter->stream_heap);
error_heap_init:
error_heap_init:
- if (heap_init(iter->stream_heap, 0, stream_compare) < 0) {
- heap_free(iter->stream_heap);
+ if (
bt_
heap_init(iter->stream_heap, 0, stream_compare) < 0) {
+
bt_
heap_free(iter->stream_heap);
g_free(iter->stream_heap);
iter->stream_heap = NULL;
ret = -ENOMEM;
g_free(iter->stream_heap);
iter->stream_heap = NULL;
ret = -ENOMEM;
@@
-555,12
+555,12
@@
struct bt_iter_pos *bt_iter_get_pos(struct bt_iter *iter)
if (!pos->u.restore->stream_saved_pos)
goto error;
if (!pos->u.restore->stream_saved_pos)
goto error;
- ret = heap_copy(&iter_heap_copy, iter->stream_heap);
+ ret =
bt_
heap_copy(&iter_heap_copy, iter->stream_heap);
if (ret < 0)
goto error_heap;
/* iterate over each stream in the heap */
if (ret < 0)
goto error_heap;
/* iterate over each stream in the heap */
- file_stream = heap_maximum(&iter_heap_copy);
+ file_stream =
bt_
heap_maximum(&iter_heap_copy);
while (file_stream != NULL) {
struct stream_saved_pos saved_pos;
while (file_stream != NULL) {
struct stream_saved_pos saved_pos;
@@
-584,12
+584,12
@@
struct bt_iter_pos *bt_iter_get_pos(struct bt_iter *iter)
saved_pos.current_real_timestamp);
/* remove the stream from the heap copy */
saved_pos.current_real_timestamp);
/* remove the stream from the heap copy */
- removed = heap_remove(&iter_heap_copy);
+ removed =
bt_
heap_remove(&iter_heap_copy);
assert(removed == file_stream);
assert(removed == file_stream);
- file_stream = heap_maximum(&iter_heap_copy);
+ file_stream =
bt_
heap_maximum(&iter_heap_copy);
}
}
- heap_free(&iter_heap_copy);
+
bt_
heap_free(&iter_heap_copy);
return pos;
error_heap:
return pos;
error_heap:
@@
-669,7
+669,7
@@
int bt_iter_init(struct bt_iter *iter,
bt_context_get(ctx);
iter->ctx = ctx;
bt_context_get(ctx);
iter->ctx = ctx;
- ret = heap_init(iter->stream_heap, 0, stream_compare);
+ ret =
bt_
heap_init(iter->stream_heap, 0, stream_compare);
if (ret < 0)
goto error_heap_init;
if (ret < 0)
goto error_heap_init;
@@
-718,7
+718,7
@@
int bt_iter_init(struct bt_iter *iter,
goto error;
}
/* Add to heap */
goto error;
}
/* Add to heap */
- ret = heap_insert(iter->stream_heap, file_stream);
+ ret =
bt_
heap_insert(iter->stream_heap, file_stream);
if (ret)
goto error;
}
if (ret)
goto error;
}
@@
-729,7
+729,7
@@
int bt_iter_init(struct bt_iter *iter,
return 0;
error:
return 0;
error:
- heap_free(iter->stream_heap);
+
bt_
heap_free(iter->stream_heap);
error_heap_init:
g_free(iter->stream_heap);
iter->stream_heap = NULL;
error_heap_init:
g_free(iter->stream_heap);
iter->stream_heap = NULL;
@@
-760,7
+760,7
@@
void bt_iter_fini(struct bt_iter *iter)
{
assert(iter);
if (iter->stream_heap) {
{
assert(iter);
if (iter->stream_heap) {
- heap_free(iter->stream_heap);
+
bt_
heap_free(iter->stream_heap);
g_free(iter->stream_heap);
}
iter->ctx->current_iterator = NULL;
g_free(iter->stream_heap);
}
iter->ctx->current_iterator = NULL;
@@
-782,7
+782,7
@@
int bt_iter_next(struct bt_iter *iter)
if (!iter)
return -EINVAL;
if (!iter)
return -EINVAL;
- file_stream = heap_maximum(iter->stream_heap);
+ file_stream =
bt_
heap_maximum(iter->stream_heap);
if (!file_stream) {
/* end of file for all streams */
ret = 0;
if (!file_stream) {
/* end of file for all streams */
ret = 0;
@@
-791,7
+791,7
@@
int bt_iter_next(struct bt_iter *iter)
ret = stream_read_event(file_stream);
if (ret == EOF) {
ret = stream_read_event(file_stream);
if (ret == EOF) {
- removed = heap_remove(iter->stream_heap);
+ removed =
bt_
heap_remove(iter->stream_heap);
assert(removed == file_stream);
ret = 0;
goto end;
assert(removed == file_stream);
ret = 0;
goto end;
@@
-799,7
+799,7
@@
int bt_iter_next(struct bt_iter *iter)
goto end;
}
/* Reinsert the file stream into the heap, and rebalance. */
goto end;
}
/* Reinsert the file stream into the heap, and rebalance. */
- removed = heap_replace_max(iter->stream_heap, file_stream);
+ removed =
bt_
heap_replace_max(iter->stream_heap, file_stream);
assert(removed == file_stream);
end:
assert(removed == file_stream);
end:
This page took
0.026673 seconds
and
4
git commands to generate.