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

libbabeltrace should not know about them.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 51a87083f10cd82c67403be898edff8277decf3a..5911b19d25cdaa5f45735893a0771af1fbf42b6a 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -1384,6 +1384,12 @@ struct trace_descriptor *ctf_open_trace(const char *path, int flags,
        struct ctf_trace *td;
        int ret;
 
+       /*
+        * If packet_seek is NULL, we provide our default version.
+        */
+       if (!packet_seek)
+               packet_seek = ctf_packet_seek;
+
        td = g_new0(struct ctf_trace, 1);
 
        switch (flags & O_ACCMODE) {

diff --git a/lib/context.c b/lib/context.c
index f4c234aa6f955960edccb0f0550928c254b22d74..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_packet_seek */
-
 #include <glib.h>
 
 struct bt_context *bt_context_create(void)
@@ -71,8 +68,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
                ret = -1;
                goto end;
        }
-       td = fmt->open_trace(path, O_RDONLY,
-                            ctf_packet_seek, NULL);
+       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);