ctf.fs: bt_ctf_notif_iter_create(): assert() that all medops exist

[babeltrace.git] / formats / bt-dummy / bt-dummy.c

diff --git a/formats/bt-dummy/bt-dummy.c b/formats/bt-dummy/bt-dummy.c
index b55dd696daee73847954e0df0c95be42125a072f..fd10ccad39e3f79a500ddf12a87124ec135380ca 100644 (file)
--- a/formats/bt-dummy/bt-dummy.c
+++ b/formats/bt-dummy/bt-dummy.c
@@ -38,15 +38,23 @@
 #include <unistd.h>
 #include <stdlib.h>
 
+void bt_dummy_hook(void)
+{
+       /*
+        * Dummy function to prevent the linker from discarding this format as
+        * "unused" in static builds.
+        */
+}
+
 static
-int bt_dummy_write_event(struct stream_pos *ppos, struct ctf_stream_definition *stream)
+int bt_dummy_write_event(struct bt_stream_pos *ppos, struct ctf_stream_definition *stream)
 {
        return 0;
 }
 
 static
-struct trace_descriptor *bt_dummy_open_trace(const char *path, int flags,
-               void (*packet_seek)(struct stream_pos *pos, size_t index,
+struct bt_trace_descriptor *bt_dummy_open_trace(const char *path, int flags,
+               void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
                        int whence), FILE *metadata_fp)
 {
        struct ctf_text_stream_pos *pos;
@@ -54,11 +62,12 @@ struct trace_descriptor *bt_dummy_open_trace(const char *path, int flags,
        pos = g_new0(struct ctf_text_stream_pos, 1);
        pos->parent.rw_table = NULL;
        pos->parent.event_cb = bt_dummy_write_event;
+       pos->parent.trace = &pos->trace_descriptor;
        return &pos->trace_descriptor;
 }
 
 static
-int bt_dummy_close_trace(struct trace_descriptor *td)
+int bt_dummy_close_trace(struct bt_trace_descriptor *td)
 {
        struct ctf_text_stream_pos *pos =
                container_of(td, struct ctf_text_stream_pos,
@@ -68,7 +77,7 @@ int bt_dummy_close_trace(struct trace_descriptor *td)
 }
 
 static
-struct format bt_dummy_format = {
+struct bt_format bt_dummy_format = {
        .open_trace = bt_dummy_open_trace,
        .close_trace = bt_dummy_close_trace,
 };
@@ -78,7 +87,7 @@ void __attribute__((constructor)) bt_dummy_init(void)
 {
        int ret;
 
-       bt_dummy_format.name = g_quark_from_static_string("dummy");
+       bt_dummy_format.name = g_quark_from_string("dummy");
        ret = bt_register_format(&bt_dummy_format);
        assert(!ret);
 }