Fix: packet_seek is local to plugins, but can be overridden

[babeltrace.git] / lib / context.c

diff --git a/lib/context.c b/lib/context.c
index 5408bc81c942c5ceead7a951b164e8b60c4d46f4..715273a957ea3ff0ea38cd5fba39a099161e80b2 100644 (file)
--- a/lib/context.c
+++ b/lib/context.c
@@ -31,9 +31,6 @@
 #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)
@@ -57,19 +54,26 @@ 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)
 {
        struct trace_descriptor *td;
        struct format *fmt;
        struct bt_trace_handle *handle;
-
-       fmt = bt_lookup_format(g_quark_from_string(format_str));
-       td = fmt->open_trace(path, O_RDONLY,
-                            ctf_move_pos_slow, NULL);
+       int ret;
+
+       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;
+       }
+       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);
-               return -1;
+               ret = -1;
+               goto end;
        }
 
        /* Create an handle for the trace */
@@ -77,7 +81,8 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
        if (handle < 0) {
                fprintf(stderr, "[error] [Context] Creating trace handle %s .\n\n",
                                path);
-               return -1;
+               ret = -1;
+               goto end;
        }
        handle->format = fmt;
        handle->td = td;
@@ -88,7 +93,11 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
        g_hash_table_insert(ctx->trace_handles,
                (gpointer) (unsigned long) handle->id,
                handle);
-       return trace_collection_add(ctx->tc, td);
+       ret = trace_collection_add(ctx->tc, td);
+       if (ret == 0)
+               return handle->id;
+end:
+       return ret;
 }
 
 void bt_context_remove_trace(struct bt_context *ctx, int handle_id)