source.ctf.fs: remove ctf_fs_debug symbol

[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 47f780a9c6d8109138536eae7d8f059df74a1812..f6a9f791d983695352151e1f8e2bca08a38c5873 100644 (file)
--- a/plugins/ctf/fs-src/fs.c
+++ b/plugins/ctf/fs-src/fs.c
@@ -52,9 +52,6 @@
 #define BT_LOG_TAG "PLUGIN-CTF-FS-SRC"
 #include "logging.h"
 
-BT_HIDDEN
-bool ctf_fs_debug;
-
 static
 int notif_iter_data_set_current_ds_file(struct ctf_fs_notif_iter_data *notif_iter_data)
 {
@@ -71,7 +68,7 @@ int notif_iter_data_set_current_ds_file(struct ctf_fs_notif_iter_data *notif_ite
        notif_iter_data->ds_file = ctf_fs_ds_file_create(
                notif_iter_data->ds_file_group->ctf_fs_trace,
                notif_iter_data->ds_file_group->stream,
-               ds_file_info->path->str, true);
+               ds_file_info->path->str);
        if (!notif_iter_data->ds_file) {
                ret = -1;
        }
@@ -216,11 +213,9 @@ void ctf_fs_destroy(struct ctf_fs_component *ctf_fs)
        g_free(ctf_fs);
 }
 
-static
-void ctf_fs_trace_destroy(void *data)
+BT_HIDDEN
+void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace)
 {
-       struct ctf_fs_trace *ctf_fs_trace = data;
-
        if (!ctf_fs_trace) {
                return;
        }
@@ -246,6 +241,13 @@ void ctf_fs_trace_destroy(void *data)
        g_free(ctf_fs_trace);
 }
 
+static
+void ctf_fs_trace_destroy_notifier(void *data)
+{
+       struct ctf_fs_trace *trace = data;
+       ctf_fs_trace_destroy(trace);
+}
+
 void ctf_fs_finalize(struct bt_private_component *component)
 {
        void *data = bt_private_component_get_user_data(component);
@@ -388,7 +390,7 @@ struct bt_ctf_stream_class *stream_class_from_packet_header(
        stream_id_field = bt_ctf_field_structure_get_field_by_name(
                packet_header_field, "stream_id");
        if (!stream_id_field) {
-               goto end;
+               goto single_stream_class;
        }
 
        ret = bt_ctf_field_unsigned_integer_get_value(stream_id_field,
@@ -487,12 +489,13 @@ void ctf_fs_ds_file_info_destroy(struct ctf_fs_ds_file_info *ds_file_info)
                g_string_free(ds_file_info->path, TRUE);
        }
 
+       ctf_fs_ds_index_destroy(ds_file_info->index);
        g_free(ds_file_info);
 }
 
 static
 struct ctf_fs_ds_file_info *ctf_fs_ds_file_info_create(const char *path,
-               uint64_t begin_ns)
+               uint64_t begin_ns, struct ctf_fs_ds_index *index)
 {
        struct ctf_fs_ds_file_info *ds_file_info;
 
@@ -509,8 +512,11 @@ struct ctf_fs_ds_file_info *ctf_fs_ds_file_info_create(const char *path,
        }
 
        ds_file_info->begin_ns = begin_ns;
+       ds_file_info->index = index;
+       index = NULL;
 
 end:
+       ctf_fs_ds_index_destroy(index);
        return ds_file_info;
 }
 
@@ -576,13 +582,16 @@ end:
 static
 int ctf_fs_ds_file_group_add_ds_file_info(
                struct ctf_fs_ds_file_group *ds_file_group,
-               const char *path, uint64_t begin_ns)
+               const char *path, uint64_t begin_ns,
+               struct ctf_fs_ds_index *index)
 {
        struct ctf_fs_ds_file_info *ds_file_info;
        gint i = 0;
        int ret = 0;
 
-       ds_file_info = ctf_fs_ds_file_info_create(path, begin_ns);
+       /* Onwership of index is transferred. */
+       ds_file_info = ctf_fs_ds_file_info_create(path, begin_ns, index);
+       index = NULL;
        if (!ds_file_info) {
                goto error;
        }
@@ -608,8 +617,8 @@ int ctf_fs_ds_file_group_add_ds_file_info(
 
 error:
        ctf_fs_ds_file_info_destroy(ds_file_info);
+       ctf_fs_ds_index_destroy(index);
        ret = -1;
-
 end:
        return ret;
 }
@@ -627,10 +636,16 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
        bool add_group = false;
        int ret;
        size_t i;
+       struct ctf_fs_ds_file *ds_file;
+       struct ctf_fs_ds_index *index = NULL;
+
+       ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, path);
+       if (!ds_file) {
+               goto error;
+       }
 
-       ret = ctf_fs_ds_file_get_packet_header_context_fields(
-               ctf_fs_trace, path, &packet_header_field,
-               &packet_context_field);
+       ret = ctf_fs_ds_file_get_packet_header_context_fields(ds_file,
+               &packet_header_field, &packet_context_field);
        if (ret) {
                BT_LOGE("Cannot get stream file's first packet's header and context fields (`%s`).",
                        path);
@@ -647,6 +662,12 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
                goto error;
        }
 
+       index = ctf_fs_ds_file_build_index(ds_file);
+       if (!index) {
+               BT_LOGW("Failed to index CTF stream file \'%s\'",
+                       ds_file->file->path->str);
+       }
+
        if (begin_ns == -1ULL) {
                /*
                 * No beggining timestamp to sort the stream files
@@ -672,7 +693,9 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
                }
 
                ret = ctf_fs_ds_file_group_add_ds_file_info(ds_file_group,
-                               path, begin_ns);
+                               path, begin_ns, index);
+               /* Ownership of index is transferred. */
+               index = NULL;
                if (ret) {
                        goto error;
                }
@@ -717,7 +740,8 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
        }
 
        ret = ctf_fs_ds_file_group_add_ds_file_info(ds_file_group,
-                       path, begin_ns);
+                       path, begin_ns, index);
+       index = NULL;
        if (ret) {
                goto error;
        }
@@ -732,7 +756,8 @@ end:
        if (add_group && ds_file_group) {
                g_ptr_array_add(ctf_fs_trace->ds_file_groups, ds_file_group);
        }
-
+       ctf_fs_ds_file_destroy(ds_file);
+       ctf_fs_ds_index_destroy(index);
        bt_put(packet_header_field);
        bt_put(packet_context_field);
        bt_put(stream_class);
@@ -807,7 +832,7 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace)
                ret = add_ds_file_to_ds_file_group(ctf_fs_trace,
                        file->path->str);
                if (ret) {
-                       BT_LOGD("Cannot add stream file `%s` to stream file group",
+                       BT_LOGE("Cannot add stream file `%s` to stream file group",
                                file->path->str);
                        ctf_fs_file_destroy(file);
                        goto error;
@@ -871,7 +896,7 @@ end:
        return ret;
 }
 
-static
+BT_HIDDEN
 struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name,
                struct metadata_overrides *overrides)
 {
@@ -1274,7 +1299,8 @@ struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp,
                goto error;
        }
 
-       ctf_fs->traces = g_ptr_array_new_with_free_func(ctf_fs_trace_destroy);
+       ctf_fs->traces = g_ptr_array_new_with_free_func(
+                       ctf_fs_trace_destroy_notifier);
        if (!ctf_fs->traces) {
                goto error;
        }
@@ -1304,7 +1330,6 @@ enum bt_component_status ctf_fs_init(struct bt_private_component *priv_comp,
        struct ctf_fs_component *ctf_fs;
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 
-       ctf_fs_debug = g_strcmp0(getenv("CTF_FS_DEBUG"), "1") == 0;
        ctf_fs = ctf_fs_create(priv_comp, params);
        if (!ctf_fs) {
                ret = BT_COMPONENT_STATUS_ERROR;
@@ -1321,6 +1346,8 @@ struct bt_value *ctf_fs_query(struct bt_component_class *comp_class,
 
        if (!strcmp(object, "metadata-info")) {
                result = metadata_info_query(comp_class, params);
+       } else if (!strcmp(object, "trace-info")) {
+               result = trace_info_query(comp_class, params);
        } else {
                BT_LOGE("Unknown query object `%s`", object);
                goto end;