projects / babeltrace.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ctf: const-ify a few bt_message parameters
[babeltrace.git] / src / plugins / ctf / fs-src / data-stream-file.c
diff --git a/src/plugins/ctf/fs-src/data-stream-file.c b/src/plugins/ctf/fs-src/data-stream-file.c
index 70f419022f9b4c91dfc4b2284f51ff59b5c1a70f..b8091f660755c6524715fc92c71ed45a09a31ac5 100644 (file)
--- a/src/plugins/ctf/fs-src/data-stream-file.c
+++ b/src/plugins/ctf/fs-src/data-stream-file.c
@@ -22,8 +22,8 @@
  * SOFTWARE.
  */
 
-#define BT_COMP_LOG_SELF_COMP (ds_file->self_comp)
-#define BT_LOG_OUTPUT_LEVEL (ds_file->log_level)
+#define BT_COMP_LOG_SELF_COMP (self_comp)
+#define BT_LOG_OUTPUT_LEVEL (log_level)
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/DS"
 #include "logging/comp-logging.h"
 
@@ -55,6 +55,8 @@ static
 int ds_file_munmap(struct ctf_fs_ds_file *ds_file)
 {
        int ret = 0;
+       bt_self_component *self_comp = ds_file->self_comp;
+       bt_logging_level log_level = ds_file->log_level;
 
        if (!ds_file || !ds_file->mmap_addr) {
                goto end;
@@ -82,6 +84,8 @@ enum ctf_msg_iter_medium_status ds_file_mmap_next(
 {
        enum ctf_msg_iter_medium_status ret =
                        CTF_MSG_ITER_MEDIUM_STATUS_OK;
+       bt_self_component *self_comp = ds_file->self_comp;
+       bt_logging_level log_level = ds_file->log_level;
 
        /* Unmap old region */
        if (ds_file->mmap_addr) {
@@ -133,6 +137,8 @@ enum ctf_msg_iter_medium_status medop_request_bytes(
        enum ctf_msg_iter_medium_status status =
                CTF_MSG_ITER_MEDIUM_STATUS_OK;
        struct ctf_fs_ds_file *ds_file = data;
+       bt_self_component *self_comp = ds_file->self_comp;
+       bt_logging_level log_level = ds_file->log_level;
 
        if (request_sz == 0) {
                goto end;
@@ -211,6 +217,8 @@ enum ctf_msg_iter_medium_status medop_seek(enum ctf_msg_iter_seek_whence whence,
                        CTF_MSG_ITER_MEDIUM_STATUS_OK;
        struct ctf_fs_ds_file *ds_file = data;
        off_t offset_in_mapping, file_size = ds_file->file->size;
+       bt_self_component *self_comp = ds_file->self_comp;
+       bt_logging_level log_level = ds_file->log_level;
 
        if (whence != CTF_MSG_ITER_SEEK_WHENCE_SET ||
                offset < 0 || offset > file_size) {
@@ -272,6 +280,24 @@ struct ctf_msg_iter_medium_ops ctf_fs_ds_file_medops = {
        .seek = medop_seek,
 };
 
+static
+struct ctf_fs_ds_index_entry *ctf_fs_ds_index_entry_create(
+               bt_self_component *self_comp, bt_logging_level log_level)
+{
+       struct ctf_fs_ds_index_entry *entry;
+
+       entry = g_new0(struct ctf_fs_ds_index_entry, 1);
+       if (!entry) {
+               BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Failed to allocate a ctf_fs_ds_index_entry.");
+               goto end;
+       }
+
+       entry->packet_seq_num = UINT64_MAX;
+
+end:
+       return entry;
+}
+
 static
 int convert_cycles_to_ns(struct ctf_clock_class *clock_class,
                uint64_t cycles, int64_t *ns)
@@ -284,7 +310,8 @@ int convert_cycles_to_ns(struct ctf_clock_class *clock_class,
 static
 struct ctf_fs_ds_index *build_index_from_idx_file(
                struct ctf_fs_ds_file *ds_file,
-               struct ctf_fs_ds_file_info *file_info)
+               struct ctf_fs_ds_file_info *file_info,
+               struct ctf_msg_iter *msg_iter)
 {
        int ret;
        gchar *directory = NULL;
@@ -304,10 +331,12 @@ struct ctf_fs_ds_index *build_index_from_idx_file(
        struct ctf_stream_class *sc;
        struct ctf_msg_iter_packet_properties props;
        uint32_t version_major, version_minor;
+       bt_self_component *self_comp = ds_file->self_comp;
+       bt_logging_level log_level = ds_file->log_level;
 
        BT_COMP_LOGI("Building index from .idx file of stream file %s",
                        ds_file->file->path->str);
-       ret = ctf_msg_iter_get_packet_properties(ds_file->msg_iter, &props);
+       ret = ctf_msg_iter_get_packet_properties(msg_iter, &props);
        if (ret) {
                BT_COMP_LOGI_STR("Cannot read first packet's header and context fields.");
                goto error;
@@ -409,8 +438,11 @@ struct ctf_fs_ds_index *build_index_from_idx_file(
                        goto error;
                }
 
-               index_entry = g_new0(struct ctf_fs_ds_index_entry, 1);
+               index_entry = ctf_fs_ds_index_entry_create(
+                       ds_file->self_comp, ds_file->log_level);
                if (!index_entry) {
+                       BT_COMP_LOGE_APPEND_CAUSE(ds_file->self_comp,
+                               "Failed to create a ctf_fs_ds_index_entry.");
                        goto error;
                }
 
@@ -455,6 +487,10 @@ struct ctf_fs_ds_index *build_index_from_idx_file(
                        goto error;
                }
 
+               if (version_minor >= 1) {
+                       index_entry->packet_seq_num = be64toh(file_index->packet_seq_num);
+               }
+
                total_packets_size += packet_size;
                file_pos += file_index_entry_size;
 
@@ -498,6 +534,8 @@ int init_index_entry(struct ctf_fs_ds_index_entry *entry,
 {
        int ret = 0;
        struct ctf_stream_class *sc;
+       bt_self_component *self_comp = ds_file->self_comp;
+       bt_logging_level log_level = ds_file->log_level;
 
        sc = ctf_trace_class_borrow_stream_class_by_id(ds_file->metadata->tc,
                props->stream_class_id);
@@ -546,12 +584,15 @@ end:
 static
 struct ctf_fs_ds_index *build_index_from_stream_file(
                struct ctf_fs_ds_file *ds_file,
-               struct ctf_fs_ds_file_info *file_info)
+               struct ctf_fs_ds_file_info *file_info,
+               struct ctf_msg_iter *msg_iter)
 {
        int ret;
        struct ctf_fs_ds_index *index = NULL;
        enum ctf_msg_iter_status iter_status = CTF_MSG_ITER_STATUS_OK;
        off_t current_packet_offset_bytes = 0;
+       bt_self_component *self_comp = ds_file->self_comp;
+       bt_logging_level log_level = ds_file->log_level;
 
        BT_COMP_LOGI("Indexing stream file %s", ds_file->file->path->str);
 
@@ -576,14 +617,14 @@ struct ctf_fs_ds_index *build_index_from_stream_file(
                        break;
                }
 
-               iter_status = ctf_msg_iter_seek(ds_file->msg_iter,
+               iter_status = ctf_msg_iter_seek(msg_iter,
                                current_packet_offset_bytes);
                if (iter_status != CTF_MSG_ITER_STATUS_OK) {
                        goto error;
                }
 
                iter_status = ctf_msg_iter_get_packet_properties(
-                       ds_file->msg_iter, &props);
+                       msg_iter, &props);
                if (iter_status != CTF_MSG_ITER_STATUS_OK) {
                        goto error;
                }
@@ -607,9 +648,11 @@ struct ctf_fs_ds_index *build_index_from_stream_file(
                        goto error;
                }
 
-               index_entry = g_new0(struct ctf_fs_ds_index_entry, 1);
+               index_entry = ctf_fs_ds_index_entry_create(
+                       ds_file->self_comp, ds_file->log_level);
                if (!index_entry) {
-                       BT_COMP_LOGE_STR("Failed to allocate a new index entry.");
+                       BT_COMP_LOGE_APPEND_CAUSE(ds_file->self_comp,
+                               "Failed to create a ctf_fs_ds_index_entry.");
                        goto error;
                }
 
@@ -644,8 +687,7 @@ error:
 BT_HIDDEN
 struct ctf_fs_ds_file *ctf_fs_ds_file_create(
                struct ctf_fs_trace *ctf_fs_trace,
-               bt_self_message_iterator *pc_msg_iter,
-               struct ctf_msg_iter *msg_iter,
+               bt_self_message_iterator *self_msg_iter,
                bt_stream *stream, const char *path,
                bt_logging_level log_level)
 {
@@ -659,7 +701,7 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create(
 
        ds_file->log_level = log_level;
        ds_file->self_comp = ctf_fs_trace->self_comp;
-       ds_file->self_msg_iter = pc_msg_iter;
+       ds_file->self_msg_iter = self_msg_iter;
        ds_file->file = ctf_fs_file_create(log_level, ds_file->self_comp);
        if (!ds_file->file) {
                goto error;
@@ -674,12 +716,6 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create(
                goto error;
        }
 
-       ds_file->msg_iter = msg_iter;
-       ctf_msg_iter_set_medops_data(ds_file->msg_iter, ds_file);
-       if (!ds_file->msg_iter) {
-               goto error;
-       }
-
        ds_file->mmap_max_len = offset_align * 2048;
 
        goto end;
@@ -696,18 +732,21 @@ end:
 BT_HIDDEN
 struct ctf_fs_ds_index *ctf_fs_ds_file_build_index(
                struct ctf_fs_ds_file *ds_file,
-               struct ctf_fs_ds_file_info *file_info)
+               struct ctf_fs_ds_file_info *file_info,
+               struct ctf_msg_iter *msg_iter)
 {
        struct ctf_fs_ds_index *index;
+       bt_self_component *self_comp = ds_file->self_comp;
+       bt_logging_level log_level = ds_file->log_level;
 
-       index = build_index_from_idx_file(ds_file, file_info);
+       index = build_index_from_idx_file(ds_file, file_info, msg_iter);
        if (index) {
                goto end;
        }
 
        BT_COMP_LOGI("Failed to build index from .index file; "
                "falling back to stream indexing.");
-       index = build_index_from_stream_file(ds_file, file_info);
+       index = build_index_from_stream_file(ds_file, file_info, msg_iter);
 end:
        return index;
 }
@@ -759,14 +798,13 @@ void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file)
 
 BT_HIDDEN
 bt_component_class_message_iterator_next_method_status ctf_fs_ds_file_next(
-               struct ctf_fs_ds_file *ds_file,
-               bt_message **msg)
+               struct ctf_msg_iter *msg_iter,
+               const bt_message **msg)
 {
        enum ctf_msg_iter_status msg_iter_status;
        bt_component_class_message_iterator_next_method_status status;
 
-       msg_iter_status = ctf_msg_iter_get_next_message(
-               ds_file->msg_iter, msg);
+       msg_iter_status = ctf_msg_iter_get_next_message(msg_iter, msg);
 
        switch (msg_iter_status) {
        case CTF_MSG_ITER_STATUS_EOF:
BabelTrace - Trace Format Babel Tower
This page took 0.026387 seconds and 4 git commands to generate.