Fix: babeltrace should skip erroneous traces

[babeltrace.git] / lib / context.c

diff --git a/lib/context.c b/lib/context.c
index e2c062aa747378a73dd0bd5580af76452042e61e..d6b1ec8b6ba71f48e5ffe9428baf3a89f8cc42df 100644 (file)
--- a/lib/context.c
+++ b/lib/context.c
@@ -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,7 +58,11 @@ struct bt_context *bt_context_create(void)
 }
 
 int bt_context_add_trace(struct bt_context *ctx, const char *path,
-               const char *format_name)
+               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;
@@ -71,12 +76,22 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
                ret = -1;
                goto end;
        }
-       td = fmt->open_trace(path, O_RDONLY, NULL, NULL);
-       if (!td) {
-               fprintf(stderr, "[error] [Context] Cannot open_trace of the format %s .\n\n",
-                               path);
-               ret = -1;
-               goto end;
+       if (path) {
+               td = fmt->open_trace(path, O_RDONLY, packet_seek, NULL);
+               if (!td) {
+                       fprintf(stderr, "[warning] [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 */
@@ -89,9 +104,16 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
        }
        handle->format = fmt;
        handle->td = td;
+       handle->timestamp_begin = fmt->timestamp_begin(td, handle);
+       handle->timestamp_end = fmt->timestamp_end(td, handle);
        strncpy(handle->path, path, PATH_MAX);
        handle->path[PATH_MAX - 1] = '\0';
 
+       if (fmt->set_handle)
+               fmt->set_handle(td, handle);
+       if (fmt->set_context)
+               fmt->set_context(td, ctx);
+
        /* Add new handle to container */
        g_hash_table_insert(ctx->trace_handles,
                (gpointer) (unsigned long) handle->id,