projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix : only one iterator per context
[babeltrace.git]
/
lib
/
iterator.c
diff --git
a/lib/iterator.c
b/lib/iterator.c
index 0af151402b429d3fe95d9c92c42e9e07eb9436f5..ca6e5917e449b328f6ba0869397297b60d7e4e57 100644
(file)
--- a/
lib/iterator.c
+++ b/
lib/iterator.c
@@
-430,12
+430,17
@@
end:
int bt_iter_init(struct bt_iter *iter,
struct bt_context *ctx,
int bt_iter_init(struct bt_iter *iter,
struct bt_context *ctx,
- struct bt_iter_pos *begin_pos,
- struct bt_iter_pos *end_pos)
+
const
struct bt_iter_pos *begin_pos,
+
const
struct bt_iter_pos *end_pos)
{
int i, stream_id;
int ret = 0;
{
int i, stream_id;
int ret = 0;
+ if (ctx->current_iterator) {
+ ret = -1;
+ goto error_ctx;
+ }
+
iter->stream_heap = g_new(struct ptr_heap, 1);
iter->end_pos = end_pos;
bt_context_get(ctx);
iter->stream_heap = g_new(struct ptr_heap, 1);
iter->end_pos = end_pos;
bt_context_get(ctx);
@@
-486,18
+491,20
@@
int bt_iter_init(struct bt_iter *iter,
}
}
}
}
+ ctx->current_iterator = iter;
return 0;
error:
heap_free(iter->stream_heap);
error_heap_init:
g_free(iter->stream_heap);
return 0;
error:
heap_free(iter->stream_heap);
error_heap_init:
g_free(iter->stream_heap);
+error_ctx:
return ret;
}
struct bt_iter *bt_iter_create(struct bt_context *ctx,
return ret;
}
struct bt_iter *bt_iter_create(struct bt_context *ctx,
- struct bt_iter_pos *begin_pos,
- struct bt_iter_pos *end_pos)
+
const
struct bt_iter_pos *begin_pos,
+
const
struct bt_iter_pos *end_pos)
{
struct bt_iter *iter;
int ret;
{
struct bt_iter *iter;
int ret;
@@
-517,6
+524,7
@@
void bt_iter_fini(struct bt_iter *iter)
heap_free(iter->stream_heap);
g_free(iter->stream_heap);
}
heap_free(iter->stream_heap);
g_free(iter->stream_heap);
}
+ iter->ctx->current_iterator = NULL;
bt_context_put(iter->ctx);
}
bt_context_put(iter->ctx);
}
This page took
0.02448 seconds
and
4
git commands to generate.