fix : bt_ctf_iter_create defaults to BEGIN pos

[babeltrace.git] / lib / iterator.c

diff --git a/lib/iterator.c b/lib/iterator.c
index e50846f4cb6179a7cd2eb1ac1903f042d4da5f1e..f820fdb6ce87fc30196157e4dcd21fc83bdbfaba 100644 (file)
--- a/lib/iterator.c
+++ b/lib/iterator.c
@@ -436,6 +436,11 @@ int bt_iter_init(struct bt_iter *iter,
        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);
@@ -469,14 +474,22 @@ int bt_iter_init(struct bt_iter *iter,
                                                filenr);
 
                                if (begin_pos) {
-                                   ret = babeltrace_filestream_seek(file_stream, begin_pos,
+                                       ret = babeltrace_filestream_seek(
+                                                       file_stream,
+                                                       begin_pos,
+                                                       stream_id);
+                               } else {
+                                       struct bt_iter_pos pos;
+                                       pos.type = BT_SEEK_BEGIN;
+                                       ret = babeltrace_filestream_seek(
+                                                       file_stream, &pos,
                                                        stream_id);
-                                   if (ret == EOF) {
-                                          ret = 0;
-                                          continue;
-                                   } else if (ret) {
-                                          goto error;
-                                   }
+                               }
+                               if (ret == EOF) {
+                                       ret = 0;
+                                       continue;
+                               } else if (ret) {
+                                       goto error;
                                }
                                /* Add to heap */
                                ret = heap_insert(iter->stream_heap, file_stream);
@@ -486,12 +499,14 @@ 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);
+error_ctx:
        return ret;
 }
 
@@ -517,6 +532,7 @@ void bt_iter_fini(struct bt_iter *iter)
                heap_free(iter->stream_heap);
                g_free(iter->stream_heap);
        }
+       iter->ctx->current_iterator = NULL;
        bt_context_put(iter->ctx);
 }