projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Restore heap for SEEK_BEGIN
[babeltrace.git]
/
lib
/
iterator.c
diff --git
a/lib/iterator.c
b/lib/iterator.c
index 65429a890e68b6b3cb84fabb421f54c1d3a991dc..60e877ec71024d4ccf1a71c7eaea939e35c81331 100644
(file)
--- a/
lib/iterator.c
+++ b/
lib/iterator.c
@@
-276,6
+276,11
@@
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);
+ if (ret < 0)
+ goto error;
+
for (i = 0; i < tc->array->len; i++) {
struct ctf_trace *tin;
struct trace_descriptor *td_read;
for (i = 0; i < tc->array->len; i++) {
struct ctf_trace *tin;
struct trace_descriptor *td_read;
@@
-310,6
+315,9
@@
int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
if (ret != 0 && ret != EOF) {
goto error;
}
if (ret != 0 && ret != EOF) {
goto error;
}
+ ret = heap_insert(iter->stream_heap, file_stream);
+ if (ret)
+ goto error;
}
}
}
}
}
}
This page took
0.023572 seconds
and
4
git commands to generate.