lib: iterator.c: auto-seek: handle new message types

[babeltrace.git] / plugins / ctf / fs-src / fs.c

diff --git a/plugins/ctf/fs-src/fs.c b/plugins/ctf/fs-src/fs.c
index 5b15ffa2491a57e4349f2c7909c985b12bf7710b..46086905259d8d9869249b60892a978b60eda76f 100644 (file)
--- a/plugins/ctf/fs-src/fs.c
+++ b/plugins/ctf/fs-src/fs.c
@@ -88,11 +88,11 @@ void ctf_fs_msg_iter_data_destroy(
 }
 
 static
-enum bt_self_message_iterator_status ctf_fs_iterator_next_one(
+bt_self_message_iterator_status ctf_fs_iterator_next_one(
                struct ctf_fs_msg_iter_data *msg_iter_data,
                const bt_message **msg)
 {
-       enum bt_self_message_iterator_status status;
+       bt_self_message_iterator_status status;
        bt_message *priv_msg;
        int ret;
 
@@ -194,12 +194,12 @@ end:
 }
 
 BT_HIDDEN
-enum bt_self_message_iterator_status ctf_fs_iterator_next(
+bt_self_message_iterator_status ctf_fs_iterator_next(
                bt_self_message_iterator *iterator,
                bt_message_array_const msgs, uint64_t capacity,
                uint64_t *count)
 {
-       enum bt_self_message_iterator_status status =
+       bt_self_message_iterator_status status =
                BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
        struct ctf_fs_msg_iter_data *msg_iter_data =
                bt_self_message_iterator_get_data(iterator);
@@ -237,14 +237,14 @@ void ctf_fs_iterator_finalize(bt_self_message_iterator *it)
                bt_self_message_iterator_get_data(it));
 }
 
-enum bt_self_message_iterator_status ctf_fs_iterator_init(
+bt_self_message_iterator_status ctf_fs_iterator_init(
                bt_self_message_iterator *self_msg_iter,
                bt_self_component_source *self_comp,
                bt_self_component_port_output *self_port)
 {
        struct ctf_fs_port_data *port_data;
        struct ctf_fs_msg_iter_data *msg_iter_data = NULL;
-       enum bt_self_message_iterator_status ret =
+       bt_self_message_iterator_status ret =
                BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
        int iret;
 
@@ -341,7 +341,7 @@ void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace)
 }
 
 static
-void ctf_fs_trace_destroy_msgier(void *data)
+void ctf_fs_trace_destroy_notifier(void *data)
 {
        struct ctf_fs_trace *trace = data;
        ctf_fs_trace_destroy(trace);
@@ -640,16 +640,13 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
                goto error;
        }
 
-       ret = ctf_fs_ds_file_borrow_packet_header_context_fields(ds_file,
-               NULL, NULL);
+       ret = bt_msg_iter_get_packet_properties(ds_file->msg_iter, &props);
        if (ret) {
                BT_LOGE("Cannot get stream file's first packet's header and context fields (`%s`).",
                        path);
                goto error;
        }
 
-       ret = bt_msg_iter_get_packet_properties(ds_file->msg_iter, &props);
-       BT_ASSERT(ret == 0);
        sc = ctf_trace_class_borrow_stream_class_by_id(ds_file->metadata->tc,
                props.stream_class_id);
        BT_ASSERT(sc);
@@ -659,9 +656,11 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
 
        if (props.snapshots.beginning_clock != UINT64_C(-1)) {
                BT_ASSERT(sc->default_clock_class);
-               ret = bt_clock_class_cycles_to_ns_from_origin(
-                       sc->default_clock_class,
-                       props.snapshots.beginning_clock, &begin_ns);
+               ret = bt_util_clock_cycles_to_ns_from_origin(
+                       props.snapshots.beginning_clock,
+                       sc->default_clock_class->frequency,
+                       sc->default_clock_class->offset_seconds,
+                       sc->default_clock_class->offset_cycles, &begin_ns);
                if (ret) {
                        BT_LOGE("Cannot convert clock cycles to nanoseconds from origin (`%s`).",
                                path);
@@ -843,6 +842,10 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace)
                ctf_fs_file_destroy(file);
        }
 
+       if (!ctf_fs_trace->trace) {
+               goto end;
+       }
+
        /*
         * At this point, DS file groupes are created, but their
         * associated stream objects do not exist yet. This is because
@@ -962,7 +965,8 @@ end:
 }
 
 BT_HIDDEN
-struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name,
+struct ctf_fs_trace *ctf_fs_trace_create(bt_self_component_source *self_comp,
+               const char *path, const char *name,
                struct ctf_fs_metadata_config *metadata_config)
 {
        struct ctf_fs_trace *ctf_fs_trace;
@@ -995,20 +999,25 @@ struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name,
                goto error;
        }
 
-       ret = ctf_fs_metadata_set_trace_class(ctf_fs_trace, metadata_config);
+       ret = ctf_fs_metadata_set_trace_class(self_comp,
+               ctf_fs_trace, metadata_config);
        if (ret) {
                goto error;
        }
 
-       ctf_fs_trace->trace =
-               bt_trace_create(ctf_fs_trace->metadata->trace_class);
-       if (!ctf_fs_trace->trace) {
-               goto error;
+       if (ctf_fs_trace->metadata->trace_class) {
+               ctf_fs_trace->trace =
+                       bt_trace_create(ctf_fs_trace->metadata->trace_class);
+               if (!ctf_fs_trace->trace) {
+                       goto error;
+               }
        }
 
-       ret = set_trace_name(ctf_fs_trace->trace, name);
-       if (ret) {
-               goto error;
+       if (ctf_fs_trace->trace) {
+               ret = set_trace_name(ctf_fs_trace->trace, name);
+               if (ret) {
+                       goto error;
+               }
        }
 
        ret = create_ds_file_groups(ctf_fs_trace);
@@ -1021,7 +1030,9 @@ struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name,
         * trace needs. There won't be any more. Therefore it is safe to
         * make this trace static.
         */
-       (void) bt_trace_make_static(ctf_fs_trace->trace);
+       if (ctf_fs_trace->trace) {
+               (void) bt_trace_make_static(ctf_fs_trace->trace);
+       }
 
        goto end;
 
@@ -1213,7 +1224,8 @@ GList *ctf_fs_create_trace_names(GList *trace_paths, const char *base_path) {
 }
 
 static
-int create_ctf_fs_traces(struct ctf_fs_component *ctf_fs,
+int create_ctf_fs_traces(bt_self_component_source *self_comp,
+               struct ctf_fs_component *ctf_fs,
                const char *path_param)
 {
        struct ctf_fs_trace *ctf_fs_trace = NULL;
@@ -1254,8 +1266,9 @@ int create_ctf_fs_traces(struct ctf_fs_component *ctf_fs,
                GString *trace_path = tp_node->data;
                GString *trace_name = tn_node->data;
 
-               ctf_fs_trace = ctf_fs_trace_create(trace_path->str,
-                               trace_name->str, &ctf_fs->metadata_config);
+               ctf_fs_trace = ctf_fs_trace_create(self_comp,
+                               trace_path->str, trace_name->str,
+                               &ctf_fs->metadata_config);
                if (!ctf_fs_trace) {
                        BT_LOGE("Cannot create trace for `%s`.",
                                trace_path->str);
@@ -1361,12 +1374,12 @@ struct ctf_fs_component *ctf_fs_create(
        }
 
        ctf_fs->traces = g_ptr_array_new_with_free_func(
-                       ctf_fs_trace_destroy_msgier);
+                       ctf_fs_trace_destroy_notifier);
        if (!ctf_fs->traces) {
                goto error;
        }
 
-       if (create_ctf_fs_traces(ctf_fs, path_param)) {
+       if (create_ctf_fs_traces(self_comp, ctf_fs, path_param)) {
                goto error;
        }
 
@@ -1384,12 +1397,12 @@ end:
 }
 
 BT_HIDDEN
-enum bt_self_component_status ctf_fs_init(
+bt_self_component_status ctf_fs_init(
                bt_self_component_source *self_comp,
                const bt_value *params, UNUSED_VAR void *init_method_data)
 {
        struct ctf_fs_component *ctf_fs;
-       enum bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
+       bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
 
        ctf_fs = ctf_fs_create(self_comp, params);
        if (!ctf_fs) {
@@ -1400,13 +1413,13 @@ enum bt_self_component_status ctf_fs_init(
 }
 
 BT_HIDDEN
-enum bt_query_status ctf_fs_query(
+bt_query_status ctf_fs_query(
                bt_self_component_class_source *comp_class,
                const bt_query_executor *query_exec,
                const char *object, const bt_value *params,
                const bt_value **result)
 {
-       enum bt_query_status status = BT_QUERY_STATUS_OK;
+       bt_query_status status = BT_QUERY_STATUS_OK;
 
        if (!strcmp(object, "metadata-info")) {
                status = metadata_info_query(comp_class, params, result);