X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Ffs.c;h=e4eb385282ca7dc01916b395ddfe12dbdd6892b6;hb=5084732e40a7925d22f741e4ed08f19d36078fbe;hp=847450607a61d859aab6366c4028549660a6c68f;hpb=bd2d90ecf47e1cbf84ebfcf5f43ce285056b52d1;p=babeltrace.git diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c index 84745060..e4eb3852 100644 --- a/src/plugins/ctf/fs-src/fs.c +++ b/src/plugins/ctf/fs-src/fs.c @@ -25,9 +25,14 @@ * SOFTWARE. */ +#define BT_COMP_LOG_SELF_COMP self_comp +#define BT_LOG_OUTPUT_LEVEL log_level +#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS" +#include "plugins/comp-logging.h" + #include "common/common.h" #include -#include "compat/uuid.h" +#include "common/uuid.h" #include #include "common/assert.h" #include @@ -37,12 +42,10 @@ #include "data-stream-file.h" #include "file.h" #include "../common/metadata/decoder.h" +#include "../common/metadata/ctf-meta-configure-ir-trace.h" #include "../common/msg-iter/msg-iter.h" #include "query.h" -#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS" -#include "logging.h" - static int msg_iter_data_set_current_ds_file(struct ctf_fs_msg_iter_data *msg_iter_data) { @@ -61,7 +64,8 @@ int msg_iter_data_set_current_ds_file(struct ctf_fs_msg_iter_data *msg_iter_data msg_iter_data->pc_msg_iter, msg_iter_data->msg_iter, msg_iter_data->ds_file_group->stream, - ds_file_info->path->str); + ds_file_info->path->str, + msg_iter_data->log_level); if (!msg_iter_data->ds_file) { ret = -1; } @@ -100,11 +104,11 @@ void set_msg_iter_emits_stream_beginning_end_messages( } static -bt_self_message_iterator_status ctf_fs_iterator_next_one( +bt_component_class_message_iterator_next_method_status ctf_fs_iterator_next_one( struct ctf_fs_msg_iter_data *msg_iter_data, const bt_message **out_msg) { - bt_self_message_iterator_status status; + bt_component_class_message_iterator_next_method_status status; BT_ASSERT(msg_iter_data->ds_file); @@ -113,11 +117,11 @@ bt_self_message_iterator_status ctf_fs_iterator_next_one( status = ctf_fs_ds_file_next(msg_iter_data->ds_file, &msg); switch (status) { - case BT_SELF_MESSAGE_ITERATOR_STATUS_OK: + case BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK: *out_msg = msg; msg = NULL; goto end; - case BT_SELF_MESSAGE_ITERATOR_STATUS_END: + case BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END: { int ret; @@ -139,7 +143,7 @@ bt_self_message_iterator_status ctf_fs_iterator_next_one( */ ret = msg_iter_data_set_current_ds_file(msg_iter_data); if (ret) { - status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR; + status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR; goto end; } @@ -156,20 +160,21 @@ end: } BT_HIDDEN -bt_self_message_iterator_status ctf_fs_iterator_next( +bt_component_class_message_iterator_next_method_status ctf_fs_iterator_next( bt_self_message_iterator *iterator, bt_message_array_const msgs, uint64_t capacity, uint64_t *count) { - bt_self_message_iterator_status status = - BT_SELF_MESSAGE_ITERATOR_STATUS_OK; + bt_component_class_message_iterator_next_method_status status = + BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK; struct ctf_fs_msg_iter_data *msg_iter_data = bt_self_message_iterator_get_data(iterator); uint64_t i = 0; - while (i < capacity && status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) { + while (i < capacity && + status == BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) { status = ctf_fs_iterator_next_one(msg_iter_data, &msgs[i]); - if (status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) { + if (status == BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) { i++; } } @@ -177,17 +182,17 @@ bt_self_message_iterator_status ctf_fs_iterator_next( if (i > 0) { /* * Even if ctf_fs_iterator_next_one() returned something - * else than BT_SELF_MESSAGE_ITERATOR_STATUS_OK, we + * else than BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK, we * accumulated message objects in the output * message array, so we need to return - * BT_SELF_MESSAGE_ITERATOR_STATUS_OK so that they are + * BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK so that they are * transfered to downstream. This other status occurs * again the next time muxer_msg_iter_do_next() is * called, possibly without any accumulated * message, in which case we'll return it. */ *count = i; - status = BT_SELF_MESSAGE_ITERATOR_STATUS_OK; + status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK; } return status; @@ -212,17 +217,17 @@ end: } BT_HIDDEN -bt_self_message_iterator_status ctf_fs_iterator_seek_beginning( - bt_self_message_iterator *it) +bt_component_class_message_iterator_seek_beginning_method_status +ctf_fs_iterator_seek_beginning(bt_self_message_iterator *it) { struct ctf_fs_msg_iter_data *msg_iter_data = bt_self_message_iterator_get_data(it); - bt_self_message_iterator_status status = - BT_SELF_MESSAGE_ITERATOR_STATUS_OK; + bt_component_class_message_iterator_seek_beginning_method_status status = + BT_COMPONENT_CLASS_MESSAGE_ITERATOR_SEEK_BEGINNING_METHOD_STATUS_OK; BT_ASSERT(msg_iter_data); if (ctf_fs_iterator_reset(msg_iter_data)) { - status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR; + status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_SEEK_BEGINNING_METHOD_STATUS_ERROR; } return status; @@ -236,46 +241,53 @@ void ctf_fs_iterator_finalize(bt_self_message_iterator *it) } BT_HIDDEN -bt_self_message_iterator_status ctf_fs_iterator_init( +bt_component_class_message_iterator_init_method_status ctf_fs_iterator_init( bt_self_message_iterator *self_msg_iter, - bt_self_component_source *self_comp, + bt_self_component_source *self_comp_src, bt_self_component_port_output *self_port) { struct ctf_fs_port_data *port_data; struct ctf_fs_msg_iter_data *msg_iter_data = NULL; - bt_self_message_iterator_status ret = - BT_SELF_MESSAGE_ITERATOR_STATUS_OK; + bt_component_class_message_iterator_init_method_status ret = + BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK; + bt_logging_level log_level; + bt_self_component *self_comp; port_data = bt_self_component_port_get_data( bt_self_component_port_output_as_self_component_port( self_port)); BT_ASSERT(port_data); + log_level = port_data->ctf_fs->log_level; + self_comp = port_data->ctf_fs->self_comp; msg_iter_data = g_new0(struct ctf_fs_msg_iter_data, 1); if (!msg_iter_data) { - ret = BT_SELF_MESSAGE_ITERATOR_STATUS_NOMEM; + ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_MEMORY_ERROR; goto error; } + msg_iter_data->log_level = log_level; + msg_iter_data->self_comp = self_comp; msg_iter_data->pc_msg_iter = self_msg_iter; msg_iter_data->msg_iter = bt_msg_iter_create( port_data->ds_file_group->ctf_fs_trace->metadata->tc, - bt_common_get_page_size(BT_LOG_OUTPUT_LEVEL) * 8, - ctf_fs_ds_file_medops, NULL, BT_LOG_OUTPUT_LEVEL); + bt_common_get_page_size(msg_iter_data->log_level) * 8, + ctf_fs_ds_file_medops, NULL, msg_iter_data->log_level, + self_comp); if (!msg_iter_data->msg_iter) { - BT_LOGE_STR("Cannot create a CTF message iterator."); - ret = BT_SELF_MESSAGE_ITERATOR_STATUS_NOMEM; + BT_COMP_LOGE_STR("Cannot create a CTF message iterator."); + ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_MEMORY_ERROR; goto error; } msg_iter_data->ds_file_group = port_data->ds_file_group; if (ctf_fs_iterator_reset(msg_iter_data)) { - ret = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR; + ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_ERROR; goto error; } bt_self_message_iterator_set_data(self_msg_iter, msg_iter_data); - if (ret != BT_SELF_MESSAGE_ITERATOR_STATUS_OK) { + if (ret != BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK) { goto error; } @@ -359,7 +371,8 @@ void ctf_fs_trace_destroy_notifier(void *data) ctf_fs_trace_destroy(trace); } -struct ctf_fs_component *ctf_fs_component_create(void) +struct ctf_fs_component *ctf_fs_component_create(bt_logging_level log_level, + bt_self_component *self_comp) { struct ctf_fs_component *ctf_fs; @@ -368,6 +381,8 @@ struct ctf_fs_component *ctf_fs_component_create(void) goto error; } + ctf_fs->log_level = log_level; + ctf_fs->self_comp = self_comp; ctf_fs->port_data = g_ptr_array_new_with_free_func(port_data_destroy_notifier); if (!ctf_fs->port_data) { @@ -412,9 +427,9 @@ gchar *ctf_fs_make_port_name(struct ctf_fs_ds_file_group *ds_file_group) /* For the trace, use the uuid if present, else the path. */ if (ds_file_group->ctf_fs_trace->metadata->tc->is_uuid_set) { - char uuid_str[BABELTRACE_UUID_STR_LEN]; + char uuid_str[BT_UUID_STR_LEN + 1]; - bt_uuid_unparse(ds_file_group->ctf_fs_trace->metadata->tc->uuid, uuid_str); + bt_uuid_to_str(ds_file_group->ctf_fs_trace->metadata->tc->uuid, uuid_str); g_string_assign(name, uuid_str); } else { g_string_assign(name, ds_file_group->ctf_fs_trace->path->str); @@ -449,13 +464,15 @@ int create_one_port_for_trace(struct ctf_fs_component *ctf_fs, int ret = 0; struct ctf_fs_port_data *port_data = NULL; gchar *port_name; + bt_logging_level log_level = ctf_fs->log_level; + bt_self_component *self_comp = ctf_fs->self_comp; port_name = ctf_fs_make_port_name(ds_file_group); if (!port_name) { goto error; } - BT_LOGI("Creating one port named `%s`", port_name); + BT_COMP_LOGI("Creating one port named `%s`", port_name); /* Create output port for this file */ port_data = g_new0(struct ctf_fs_port_data, 1); @@ -466,7 +483,7 @@ int create_one_port_for_trace(struct ctf_fs_component *ctf_fs, port_data->ctf_fs = ctf_fs; port_data->ds_file_group = ds_file_group; ret = bt_self_component_source_add_output_port( - ctf_fs->self_comp, port_name, port_data, NULL); + ctf_fs->self_comp_src, port_name, port_data, NULL); if (ret) { goto error; } @@ -479,9 +496,7 @@ error: ret = -1; end: - if (port_name) { - g_free(port_name); - } + g_free(port_name); port_data_destroy(port_data); return ret; @@ -493,6 +508,8 @@ int create_ports_for_trace(struct ctf_fs_component *ctf_fs, { int ret = 0; size_t i; + bt_logging_level log_level = ctf_fs_trace->log_level; + bt_self_component *self_comp = ctf_fs_trace->self_comp; /* Create one output port for each stream file group */ for (i = 0; i < ctf_fs_trace->ds_file_groups->len; i++) { @@ -502,7 +519,7 @@ int create_ports_for_trace(struct ctf_fs_component *ctf_fs, ret = create_one_port_for_trace(ctf_fs, ctf_fs_trace, ds_file_group); if (ret) { - BT_LOGE("Cannot create output port."); + BT_COMP_LOGE("Cannot create output port."); goto end; } } @@ -718,24 +735,26 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, struct bt_msg_iter *msg_iter = NULL; struct ctf_stream_class *sc = NULL; struct bt_msg_iter_packet_properties props; + bt_logging_level log_level = ctf_fs_trace->log_level; + bt_self_component *self_comp = ctf_fs_trace->self_comp; msg_iter = bt_msg_iter_create(ctf_fs_trace->metadata->tc, - bt_common_get_page_size(BT_LOG_OUTPUT_LEVEL) * 8, - ctf_fs_ds_file_medops, NULL, BT_LOG_OUTPUT_LEVEL); + bt_common_get_page_size(log_level) * 8, + ctf_fs_ds_file_medops, NULL, log_level, self_comp); if (!msg_iter) { - BT_LOGE_STR("Cannot create a CTF message iterator."); + BT_COMP_LOGE_STR("Cannot create a CTF message iterator."); goto error; } ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, msg_iter, - NULL, path); + NULL, path, log_level); if (!ds_file) { goto error; } 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`).", + BT_COMP_LOGE("Cannot get stream file's first packet's header and context fields (`%s`).", path); goto error; } @@ -753,7 +772,7 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, 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`).", + BT_COMP_LOGE("Cannot convert clock cycles to nanoseconds from origin (`%s`).", path); goto error; } @@ -761,7 +780,7 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, index = ctf_fs_ds_file_build_index(ds_file); if (!index) { - BT_LOGW("Failed to index CTF stream file \'%s\'", + BT_COMP_LOGW("Failed to index CTF stream file \'%s\'", ds_file->file->path->str); } @@ -865,11 +884,13 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace) const char *basename; GError *error = NULL; GDir *dir = NULL; + bt_logging_level log_level = ctf_fs_trace->log_level; + bt_self_component *self_comp = ctf_fs_trace->self_comp; /* Check each file in the path directory, except specific ones */ dir = g_dir_open(ctf_fs_trace->path->str, 0, &error); if (!dir) { - BT_LOGE("Cannot open directory `%s`: %s (code %d)", + BT_COMP_LOGE("Cannot open directory `%s`: %s (code %d)", ctf_fs_trace->path->str, error->message, error->code); goto error; @@ -878,23 +899,23 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace) while ((basename = g_dir_read_name(dir))) { struct ctf_fs_file *file; - if (!strcmp(basename, CTF_FS_METADATA_FILENAME)) { + if (strcmp(basename, CTF_FS_METADATA_FILENAME) == 0) { /* Ignore the metadata stream. */ - BT_LOGI("Ignoring metadata file `%s" G_DIR_SEPARATOR_S "%s`", + BT_COMP_LOGI("Ignoring metadata file `%s" G_DIR_SEPARATOR_S "%s`", ctf_fs_trace->path->str, basename); continue; } if (basename[0] == '.') { - BT_LOGI("Ignoring hidden file `%s" G_DIR_SEPARATOR_S "%s`", + BT_COMP_LOGI("Ignoring hidden file `%s" G_DIR_SEPARATOR_S "%s`", ctf_fs_trace->path->str, basename); continue; } /* Create the file. */ - file = ctf_fs_file_create(); + file = ctf_fs_file_create(log_level, self_comp); if (!file) { - BT_LOGE("Cannot create stream file object for file `%s" G_DIR_SEPARATOR_S "%s`", + BT_COMP_LOGE("Cannot create stream file object for file `%s" G_DIR_SEPARATOR_S "%s`", ctf_fs_trace->path->str, basename); goto error; } @@ -903,7 +924,7 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace) g_string_append_printf(file->path, "%s" G_DIR_SEPARATOR_S "%s", ctf_fs_trace->path->str, basename); if (!g_file_test(file->path->str, G_FILE_TEST_IS_REGULAR)) { - BT_LOGI("Ignoring non-regular file `%s`", + BT_COMP_LOGI("Ignoring non-regular file `%s`", file->path->str); ctf_fs_file_destroy(file); file = NULL; @@ -912,13 +933,13 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace) ret = ctf_fs_file_open(file, "rb"); if (ret) { - BT_LOGE("Cannot open stream file `%s`", file->path->str); + BT_COMP_LOGE("Cannot open stream file `%s`", file->path->str); goto error; } if (file->size == 0) { /* Skip empty stream. */ - BT_LOGI("Ignoring empty file `%s`", file->path->str); + BT_COMP_LOGI("Ignoring empty file `%s`", file->path->str); ctf_fs_file_destroy(file); continue; } @@ -926,7 +947,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_LOGE("Cannot add stream file `%s` to stream file group", + BT_COMP_LOGE("Cannot add stream file `%s` to stream file group", file->path->str); ctf_fs_file_destroy(file); goto error; @@ -954,16 +975,16 @@ end: } static -int set_trace_name(bt_trace *trace, const char *name_suffix) +int set_trace_name(bt_trace *trace, const char *name_suffix, + bt_logging_level log_level, bt_self_component *self_comp) { int ret = 0; - const bt_trace_class *tc = bt_trace_borrow_class_const(trace); const bt_value *val; GString *name; name = g_string_new(NULL); if (!name) { - BT_LOGE_STR("Failed to allocate a GString."); + BT_COMP_LOGE_STR("Failed to allocate a GString."); ret = -1; goto end; } @@ -972,8 +993,8 @@ int set_trace_name(bt_trace *trace, const char *name_suffix) * Check if we have a trace environment string value named `hostname`. * If so, use it as the trace name's prefix. */ - val = bt_trace_class_borrow_environment_entry_value_by_name_const( - tc, "hostname"); + val = bt_trace_borrow_environment_entry_value_by_name_const( + trace, "hostname"); if (val && bt_value_is_string(val)) { g_string_append(name, bt_value_string_get(val)); @@ -1002,9 +1023,10 @@ end: } static -struct ctf_fs_trace *ctf_fs_trace_create(bt_self_component_source *self_comp, +struct ctf_fs_trace *ctf_fs_trace_create(bt_self_component *self_comp, const char *path, const char *name, - struct ctf_fs_metadata_config *metadata_config) + struct ctf_fs_metadata_config *metadata_config, + bt_logging_level log_level) { struct ctf_fs_trace *ctf_fs_trace; int ret; @@ -1014,6 +1036,8 @@ struct ctf_fs_trace *ctf_fs_trace_create(bt_self_component_source *self_comp, goto end; } + ctf_fs_trace->log_level = log_level; + ctf_fs_trace->self_comp = self_comp; ctf_fs_trace->path = g_string_new(path); if (!ctf_fs_trace->path) { goto error; @@ -1036,8 +1060,8 @@ struct ctf_fs_trace *ctf_fs_trace_create(bt_self_component_source *self_comp, goto error; } - ret = ctf_fs_metadata_set_trace_class(self_comp, - ctf_fs_trace, metadata_config); + ret = ctf_fs_metadata_set_trace_class(self_comp, ctf_fs_trace, + metadata_config); if (ret) { goto error; } @@ -1051,7 +1075,14 @@ struct ctf_fs_trace *ctf_fs_trace_create(bt_self_component_source *self_comp, } if (ctf_fs_trace->trace) { - ret = set_trace_name(ctf_fs_trace->trace, name); + ret = ctf_trace_class_configure_ir_trace( + ctf_fs_trace->metadata->tc, ctf_fs_trace->trace); + if (ret) { + goto error; + } + + ret = set_trace_name(ctf_fs_trace->trace, name, log_level, + self_comp); if (ret) { goto error; } @@ -1096,21 +1127,22 @@ end: } static -int add_trace_path(GList **trace_paths, const char *path) +int add_trace_path(GList **trace_paths, const char *path, + bt_logging_level log_level, bt_self_component *self_comp) { GString *norm_path = NULL; int ret = 0; norm_path = bt_common_normalize_path(path, NULL); if (!norm_path) { - BT_LOGE("Failed to normalize path `%s`.", path); + BT_COMP_LOGE("Failed to normalize path `%s`.", path); ret = -1; goto end; } // FIXME: Remove or ifdef for __MINGW32__ if (strcmp(norm_path->str, "/") == 0) { - BT_LOGE("Opening a trace in `/` is not supported."); + BT_COMP_LOGE("Opening a trace in `/` is not supported."); ret = -1; goto end; } @@ -1128,7 +1160,8 @@ end: } static -int ctf_fs_find_traces(GList **trace_paths, const char *start_path) +int ctf_fs_find_traces(GList **trace_paths, const char *start_path, + bt_logging_level log_level, bt_self_component *self_comp) { int ret; GError *error = NULL; @@ -1146,7 +1179,8 @@ int ctf_fs_find_traces(GList **trace_paths, const char *start_path) * Stop recursion: a CTF trace cannot contain another * CTF trace. */ - ret = add_trace_path(trace_paths, start_path); + ret = add_trace_path(trace_paths, start_path, log_level, + self_comp); goto end; } @@ -1159,12 +1193,12 @@ int ctf_fs_find_traces(GList **trace_paths, const char *start_path) dir = g_dir_open(start_path, 0, &error); if (!dir) { if (error->code == G_FILE_ERROR_ACCES) { - BT_LOGI("Cannot open directory `%s`: %s (code %d): continuing", + BT_COMP_LOGI("Cannot open directory `%s`: %s (code %d): continuing", start_path, error->message, error->code); goto end; } - BT_LOGE("Cannot open directory `%s`: %s (code %d)", + BT_COMP_LOGE("Cannot open directory `%s`: %s (code %d)", start_path, error->message, error->code); ret = -1; goto end; @@ -1179,7 +1213,8 @@ int ctf_fs_find_traces(GList **trace_paths, const char *start_path) } g_string_printf(sub_path, "%s" G_DIR_SEPARATOR_S "%s", start_path, basename); - ret = ctf_fs_find_traces(trace_paths, sub_path->str); + ret = ctf_fs_find_traces(trace_paths, sub_path->str, + log_level, self_comp); g_string_free(sub_path, TRUE); if (ret) { goto end; @@ -1254,7 +1289,7 @@ GList *ctf_fs_create_trace_names(GList *trace_paths, const char *base_path) { /* Helper for ctf_fs_component_create_ctf_fs_traces, to handle a single path/root. */ static -int ctf_fs_component_create_ctf_fs_traces_one_root(bt_self_component_source *self_comp, +int ctf_fs_component_create_ctf_fs_traces_one_root( struct ctf_fs_component *ctf_fs, const char *path_param) { @@ -1265,28 +1300,34 @@ int ctf_fs_component_create_ctf_fs_traces_one_root(bt_self_component_source *sel GList *trace_names = NULL; GList *tp_node; GList *tn_node; + bt_logging_level log_level = ctf_fs->log_level; + bt_self_component *self_comp = ctf_fs->self_comp; norm_path = bt_common_normalize_path(path_param, NULL); if (!norm_path) { - BT_LOGE("Failed to normalize path: `%s`.", + BT_COMP_LOGE("Failed to normalize path: `%s`.", path_param); goto error; } - ret = ctf_fs_find_traces(&trace_paths, norm_path->str); + ret = ctf_fs_find_traces(&trace_paths, norm_path->str, log_level, + self_comp); if (ret) { goto error; } if (!trace_paths) { - BT_LOGE("No CTF traces recursively found in `%s`.", + BT_COMP_LOGE("No CTF traces recursively found in `%s`.", path_param); + (void) BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_COMPONENT( + ctf_fs->self_comp, + "No CTF traces recursively found in `%s`.", path_param); goto error; } trace_names = ctf_fs_create_trace_names(trace_paths, norm_path->str); if (!trace_names) { - BT_LOGE("Cannot create trace names from trace paths."); + BT_COMP_LOGE("Cannot create trace names from trace paths."); goto error; } @@ -1298,9 +1339,10 @@ int ctf_fs_component_create_ctf_fs_traces_one_root(bt_self_component_source *sel ctf_fs_trace = ctf_fs_trace_create(self_comp, trace_path->str, trace_name->str, - &ctf_fs->metadata_config); + &ctf_fs->metadata_config, + log_level); if (!ctf_fs_trace) { - BT_LOGE("Cannot create trace for `%s`.", + BT_COMP_LOGE("Cannot create trace for `%s`.", trace_path->str); goto error; } @@ -1492,7 +1534,8 @@ int merge_matching_ctf_fs_ds_file_groups( dest_trace->metadata->tc, src_group->sc->id); BT_ASSERT(sc); - index = ctf_fs_ds_index_create(); + index = ctf_fs_ds_index_create(dest_trace->log_level, + dest_trace->self_comp); if (!index) { ret = -1; goto end; @@ -1535,7 +1578,7 @@ int merge_ctf_fs_traces(struct ctf_fs_trace **traces, unsigned int num_traces) struct ctf_fs_trace *winner; guint i; int ret = 0; - char uuid_str[BABELTRACE_UUID_STR_LEN]; + char uuid_str[BT_UUID_STR_LEN + 1]; BT_ASSERT(num_traces >= 2); @@ -1581,7 +1624,7 @@ int merge_ctf_fs_traces(struct ctf_fs_trace **traces, unsigned int num_traces) } /* Use the string representation of the UUID as the trace name. */ - bt_uuid_unparse(winner->metadata->tc->uuid, uuid_str); + bt_uuid_to_str(winner->metadata->tc->uuid, uuid_str); g_string_printf(winner->name, "%s", uuid_str); end: @@ -1640,7 +1683,7 @@ int merge_traces_with_same_uuid(struct ctf_fs_component *ctf_fs) /* Clear any NULL slot (traces that got merged in another one) in the array. */ for (i = 0; i < traces->len;) { - if (g_ptr_array_index(traces, i) == NULL) { + if (!g_ptr_array_index(traces, i)) { g_ptr_array_remove_index_fast(traces, i); } else { i++; @@ -1662,9 +1705,10 @@ int ctf_fs_component_create_ctf_fs_traces(bt_self_component_source *self_comp, for (i = 0; i < bt_value_array_get_size(paths_value); i++) { const bt_value *path_value = bt_value_array_borrow_element_by_index_const(paths_value, i); - const char *path = bt_value_string_get(path_value); + const char *input = bt_value_string_get(path_value); - ret = ctf_fs_component_create_ctf_fs_traces_one_root(self_comp, ctf_fs, path); + ret = ctf_fs_component_create_ctf_fs_traces_one_root(ctf_fs, + input); if (ret) { goto end; } @@ -1709,6 +1753,8 @@ int create_streams_for_trace(struct ctf_fs_trace *ctf_fs_trace) int ret; GString *name = NULL; guint i; + bt_logging_level log_level = ctf_fs_trace->log_level; + bt_self_component *self_comp = ctf_fs_trace->self_comp; for (i = 0; i < ctf_fs_trace->ds_file_groups->len; i++) { struct ctf_fs_ds_file_group *ds_file_group = @@ -1741,7 +1787,7 @@ int create_streams_for_trace(struct ctf_fs_trace *ctf_fs_trace) } if (!ds_file_group->stream) { - BT_LOGE("Cannot create stream for DS file group: " + BT_COMP_LOGE("Cannot create stream for DS file group: " "addr=%p, stream-name=\"%s\"", ds_file_group, name->str); goto error; @@ -1750,7 +1796,7 @@ int create_streams_for_trace(struct ctf_fs_trace *ctf_fs_trace) ret = bt_stream_set_name(ds_file_group->stream, name->str); if (ret) { - BT_LOGE("Cannot set stream's name: " + BT_COMP_LOGE("Cannot set stream's name: " "addr=%p, stream-name=\"%s\"", ds_file_group->stream, name->str); goto error; @@ -1780,31 +1826,34 @@ end: */ static -bool validate_paths_parameter(const bt_value *paths) +bool validate_inputs_parameter(struct ctf_fs_component *ctf_fs, + const bt_value *inputs) { bool ret; bt_value_type type; uint64_t i; + bt_logging_level log_level = ctf_fs->log_level; + bt_self_component *self_comp = ctf_fs->self_comp; - if (!paths) { - BT_LOGE("missing \"paths\" parameter"); + if (!inputs) { + BT_COMP_LOGE("missing \"inputs\" parameter"); goto error; } - type = bt_value_get_type(paths); + type = bt_value_get_type(inputs); if (type != BT_VALUE_TYPE_ARRAY) { - BT_LOGE("`paths` parameter: expecting array value: type=%s", + BT_COMP_LOGE("`inputs` parameter: expecting array value: type=%s", bt_common_value_type_string(type)); goto error; } - for (i = 0; i < bt_value_array_get_size(paths); i++) { + for (i = 0; i < bt_value_array_get_size(inputs); i++) { const bt_value *elem; - elem = bt_value_array_borrow_element_by_index_const(paths, i); + elem = bt_value_array_borrow_element_by_index_const(inputs, i); type = bt_value_get_type(elem); if (type != BT_VALUE_TYPE_STRING) { - BT_LOGE("`paths` parameter: expecting string value: index=%" PRIu64 ", type=%s", + BT_COMP_LOGE("`inputs` parameter: expecting string value: index=%" PRIu64 ", type=%s", i, bt_common_value_type_string(type)); goto error; } @@ -1821,13 +1870,15 @@ end: } bool read_src_fs_parameters(const bt_value *params, - const bt_value **paths, struct ctf_fs_component *ctf_fs) { + const bt_value **inputs, struct ctf_fs_component *ctf_fs) { bool ret; const bt_value *value; + bt_logging_level log_level = ctf_fs->log_level; + bt_self_component *self_comp = ctf_fs->self_comp; - /* paths parameter */ - *paths = bt_value_map_borrow_entry_value_const(params, "paths"); - if (!validate_paths_parameter(*paths)) { + /* inputs parameter */ + *inputs = bt_value_map_borrow_entry_value_const(params, "inputs"); + if (!validate_inputs_parameter(ctf_fs, *inputs)) { goto error; } @@ -1836,11 +1887,11 @@ bool read_src_fs_parameters(const bt_value *params, "clock-class-offset-s"); if (value) { if (!bt_value_is_signed_integer(value)) { - BT_LOGE("clock-class-offset-s must be an integer"); + BT_COMP_LOGE("clock-class-offset-s must be an integer"); goto error; } ctf_fs->metadata_config.clock_class_offset_s = - bt_value_signed_integer_get(value); + bt_value_integer_signed_get(value); } /* clock-class-offset-ns parameter */ @@ -1848,11 +1899,11 @@ bool read_src_fs_parameters(const bt_value *params, "clock-class-offset-ns"); if (value) { if (!bt_value_is_signed_integer(value)) { - BT_LOGE("clock-class-offset-ns must be an integer"); + BT_COMP_LOGE("clock-class-offset-ns must be an integer"); goto error; } ctf_fs->metadata_config.clock_class_offset_ns = - bt_value_signed_integer_get(value); + bt_value_integer_signed_get(value); } @@ -1868,34 +1919,30 @@ end: static struct ctf_fs_component *ctf_fs_create( - bt_self_component_source *self_comp, + bt_self_component_source *self_comp_src, const bt_value *params) { struct ctf_fs_component *ctf_fs = NULL; guint i; - const bt_value *paths_value; + const bt_value *inputs_value; + bt_self_component *self_comp = + bt_self_component_source_as_self_component(self_comp_src); - ctf_fs = ctf_fs_component_create(); + ctf_fs = ctf_fs_component_create(bt_component_get_logging_level( + bt_self_component_as_component(self_comp)), self_comp); if (!ctf_fs) { goto error; } - if (!read_src_fs_parameters(params, &paths_value, ctf_fs)) { + if (!read_src_fs_parameters(params, &inputs_value, ctf_fs)) { goto error; } - bt_self_component_set_data( - bt_self_component_source_as_self_component(self_comp), - ctf_fs); - - /* - * We don't need to get a new reference here because as long as - * our private ctf_fs_component object exists, the containing - * private component should also exist. - */ + bt_self_component_set_data(self_comp, ctf_fs); ctf_fs->self_comp = self_comp; + ctf_fs->self_comp_src = self_comp_src; - if (ctf_fs_component_create_ctf_fs_traces(self_comp, ctf_fs, paths_value)) { + if (ctf_fs_component_create_ctf_fs_traces(self_comp_src, ctf_fs, inputs_value)) { goto error; } @@ -1916,47 +1963,51 @@ struct ctf_fs_component *ctf_fs_create( error: ctf_fs_destroy(ctf_fs); ctf_fs = NULL; - bt_self_component_set_data( - bt_self_component_source_as_self_component(self_comp), - NULL); + bt_self_component_set_data(self_comp, NULL); end: return ctf_fs; } BT_HIDDEN -bt_self_component_status ctf_fs_init( +bt_component_class_init_method_status ctf_fs_init( bt_self_component_source *self_comp, const bt_value *params, __attribute__((unused)) void *init_method_data) { struct ctf_fs_component *ctf_fs; - bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK; + bt_component_class_init_method_status ret = + BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK; ctf_fs = ctf_fs_create(self_comp, params); if (!ctf_fs) { - ret = BT_SELF_COMPONENT_STATUS_ERROR; + ret = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR; } return ret; } BT_HIDDEN -bt_query_status ctf_fs_query( +bt_component_class_query_method_status ctf_fs_query( bt_self_component_class_source *comp_class, const bt_query_executor *query_exec, const char *object, const bt_value *params, - __attribute__((unused)) bt_logging_level log_level, + bt_logging_level log_level, const bt_value **result) { - bt_query_status status = BT_QUERY_STATUS_OK; - - if (!strcmp(object, "metadata-info")) { - status = metadata_info_query(comp_class, params, result); - } else if (!strcmp(object, "trace-info")) { - status = trace_info_query(comp_class, params, result); + bt_component_class_query_method_status status = + BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK; + + if (strcmp(object, "metadata-info") == 0) { + status = metadata_info_query(comp_class, params, log_level, + result); + } else if (strcmp(object, "trace-info") == 0) { + status = trace_info_query(comp_class, params, log_level, + result); + } else if (!strcmp(object, "support-info")) { + status = support_info_query(comp_class, params, log_level, result); } else { BT_LOGE("Unknown query object `%s`", object); - status = BT_QUERY_STATUS_INVALID_OBJECT; + status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_INVALID_OBJECT; goto end; } end: