Fix : only one iterator per context

[babeltrace.git] / lib / context.c

diff --git a/lib/context.c b/lib/context.c
index 90d77df88f6840af5a954616048f5fbc0f81c631..e9a35c1d5844f7be8c0983eb86b240901b58efd8 100644 (file)
--- a/lib/context.c
+++ b/lib/context.c
@@ -26,14 +26,14 @@
 #include <babeltrace/trace-handle-internal.h>
 #include <babeltrace/trace-collection.h>
 #include <babeltrace/format.h>
+#include <babeltrace/babeltrace-internal.h>
 #include <stdlib.h>
+#include <string.h>
+#include <assert.h>
 
 #include <fts.h>
 #include <fcntl.h> /* For O_RDONLY */
 
-/* TODO ybrosseau: should be hidden in the CTF format */
-#include <babeltrace/ctf/types.h> /* for ctf_move_pos_slow */
-
 #include <glib.h>
 
 struct bt_context *bt_context_create(void)
@@ -50,6 +50,7 @@ struct bt_context *bt_context_create(void)
                                g_direct_equal, NULL,
                                (GDestroyNotify) bt_trace_handle_destroy);
 
+       ctx->current_iterator = NULL;
        ctx->tc = g_new0(struct trace_collection, 1);
        init_trace_collection(ctx->tc);
 
@@ -57,22 +58,41 @@ struct bt_context *bt_context_create(void)
 }
 
 int bt_context_add_trace(struct bt_context *ctx, const char *path,
-               const char *format_str)
+               const char *format_name,
+               void (*packet_seek)(struct stream_pos *pos, size_t index,
+                       int whence),
+               struct mmap_stream_list *stream_list,
+               FILE *metadata)
 {
        struct trace_descriptor *td;
        struct format *fmt;
        struct bt_trace_handle *handle;
        int ret;
 
-       fmt = bt_lookup_format(g_quark_from_string(format_str));
-       td = fmt->open_trace(path, O_RDONLY,
-                            ctf_move_pos_slow, NULL);
-       if (!td) {
-               fprintf(stderr, "[error] [Context] Cannot open_trace of the format %s .\n\n",
-                               path);
+       fmt = bt_lookup_format(g_quark_from_string(format_name));
+       if (!fmt) {
+               fprintf(stderr, "[error] [Context] Format \"%s\" unknown.\n\n",
+                       format_name);
                ret = -1;
                goto end;
        }
+       if (path) {
+               td = fmt->open_trace(path, O_RDONLY, packet_seek, NULL);
+               if (!td) {
+                       fprintf(stderr, "[error] [Context] Cannot open_trace of the format %s .\n\n",
+                                       path);
+                       ret = -1;
+                       goto end;
+               }
+       } else {
+               td = fmt->open_mmap_trace(stream_list, packet_seek, metadata);
+               if (!td) {
+                       fprintf(stderr, "[error] [Context] Cannot open_trace of the format %s .\n\n",
+                                       path);
+                       ret = -1;
+                       goto end;
+               }
+       }
 
        /* Create an handle for the trace */
        handle = bt_trace_handle_create(ctx);