X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Ffs.c;h=07b4c049fc28bbd0ca155f6ab239a1921197f965;hp=12099ec4e8fa8fcbfc9b6497834914745fb1f63a;hb=312c056ae3d374b253fa0cfe5ed576c0b0e5e569;hpb=3faba6d46e33b942f525ebaf77f11bc868e5bd76 diff --git a/plugins/ctf/fs-src/fs.c b/plugins/ctf/fs-src/fs.c index 12099ec4..07b4c049 100644 --- a/plugins/ctf/fs-src/fs.c +++ b/plugins/ctf/fs-src/fs.c @@ -26,20 +26,10 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include -#include +#include #include #include #include "fs.h" @@ -48,6 +38,7 @@ #include "file.h" #include "../common/metadata/decoder.h" #include "../common/notif-iter/notif-iter.h" +#include "../common/utils/utils.h" #include "query.h" #define BT_LOG_TAG "PLUGIN-CTF-FS-SRC" @@ -59,7 +50,7 @@ int notif_iter_data_set_current_ds_file(struct ctf_fs_notif_iter_data *notif_ite struct ctf_fs_ds_file_info *ds_file_info; int ret = 0; - assert(notif_iter_data->ds_file_info_index < + BT_ASSERT(notif_iter_data->ds_file_info_index < notif_iter_data->ds_file_group->ds_file_infos->len); ds_file_info = g_ptr_array_index( notif_iter_data->ds_file_group->ds_file_infos, @@ -89,35 +80,68 @@ void ctf_fs_notif_iter_data_destroy( ctf_fs_ds_file_destroy(notif_iter_data->ds_file); if (notif_iter_data->notif_iter) { - bt_ctf_notif_iter_destroy(notif_iter_data->notif_iter); + bt_notif_iter_destroy(notif_iter_data->notif_iter); } g_free(notif_iter_data); } -struct bt_notification_iterator_next_return ctf_fs_iterator_next( - struct bt_private_notification_iterator *iterator) +struct bt_notification_iterator_next_method_return ctf_fs_iterator_next( + struct bt_private_connection_private_notification_iterator *iterator) { - struct bt_notification_iterator_next_return next_ret; + struct bt_notification_iterator_next_method_return next_ret; struct ctf_fs_notif_iter_data *notif_iter_data = - bt_private_notification_iterator_get_user_data(iterator); + bt_private_connection_private_notification_iterator_get_user_data(iterator); int ret; - assert(notif_iter_data->ds_file); + BT_ASSERT(notif_iter_data->ds_file); next_ret = ctf_fs_ds_file_next(notif_iter_data->ds_file); - if (next_ret.status == BT_NOTIFICATION_ITERATOR_STATUS_END) { - assert(!next_ret.notification); + + if (next_ret.status == BT_NOTIFICATION_ITERATOR_STATUS_OK && + bt_notification_get_type(next_ret.notification) == + BT_NOTIFICATION_TYPE_STREAM_BEGIN) { + if (notif_iter_data->skip_stream_begin_notifs) { + /* + * We already emitted a + * BT_NOTIFICATION_TYPE_STREAM_BEGIN + * notification: skip this one, get a new one. + */ + BT_PUT(next_ret.notification); + next_ret = ctf_fs_ds_file_next(notif_iter_data->ds_file); + BT_ASSERT(next_ret.status != BT_NOTIFICATION_ITERATOR_STATUS_END); + goto end; + } else { + /* + * First BT_NOTIFICATION_TYPE_STREAM_BEGIN + * notification: skip all following. + */ + notif_iter_data->skip_stream_begin_notifs = true; + goto end; + } + } + + if (next_ret.status == BT_NOTIFICATION_ITERATOR_STATUS_OK && + bt_notification_get_type(next_ret.notification) == + BT_NOTIFICATION_TYPE_STREAM_END) { notif_iter_data->ds_file_info_index++; if (notif_iter_data->ds_file_info_index == notif_iter_data->ds_file_group->ds_file_infos->len) { /* * No more stream files to read: we reached the - * real end. + * real end. Emit this + * BT_NOTIFICATION_TYPE_STREAM_END notification. + * The next time ctf_fs_iterator_next() is + * called for this notification iterator, + * ctf_fs_ds_file_next() will return + * BT_NOTIFICATION_ITERATOR_STATUS_END(). */ goto end; } + BT_PUT(next_ret.notification); + bt_notif_iter_reset(notif_iter_data->notif_iter); + /* * Open and start reading the next stream file within * our stream file group. @@ -131,30 +155,46 @@ struct bt_notification_iterator_next_return ctf_fs_iterator_next( next_ret = ctf_fs_ds_file_next(notif_iter_data->ds_file); /* - * We should not get BT_NOTIFICATION_ITERATOR_STATUS_END - * with a brand new stream file because empty stream - * files are not even part of stream file groups, which - * means we're sure to get at least one pair of "packet - * begin" and "packet end" notifications in the case of - * a single, empty packet. + * If we get a notification, we expect to get a + * BT_NOTIFICATION_TYPE_STREAM_BEGIN notification + * because the iterator's state machine emits one before + * even requesting the first block of data from the + * medium. Skip this notification because we're not + * really starting a new stream here, and try getting a + * new notification (which, if it works, is a + * BT_NOTIFICATION_TYPE_PACKET_BEGIN one). We're sure to + * get at least one pair of + * BT_NOTIFICATION_TYPE_PACKET_BEGIN and + * BT_NOTIFICATION_TYPE_PACKET_END notifications in the + * case of a single, empty packet. We know there's at + * least one packet because the stream file group does + * not contain empty stream files. */ - assert(next_ret.status != BT_NOTIFICATION_ITERATOR_STATUS_END); + BT_ASSERT(notif_iter_data->skip_stream_begin_notifs); + + if (next_ret.status == BT_NOTIFICATION_ITERATOR_STATUS_OK) { + BT_ASSERT(bt_notification_get_type(next_ret.notification) == + BT_NOTIFICATION_TYPE_STREAM_BEGIN); + BT_PUT(next_ret.notification); + next_ret = ctf_fs_ds_file_next(notif_iter_data->ds_file); + BT_ASSERT(next_ret.status != BT_NOTIFICATION_ITERATOR_STATUS_END); + } } end: return next_ret; } -void ctf_fs_iterator_finalize(struct bt_private_notification_iterator *it) +void ctf_fs_iterator_finalize(struct bt_private_connection_private_notification_iterator *it) { void *notif_iter_data = - bt_private_notification_iterator_get_user_data(it); + bt_private_connection_private_notification_iterator_get_user_data(it); ctf_fs_notif_iter_data_destroy(notif_iter_data); } enum bt_notification_iterator_status ctf_fs_iterator_init( - struct bt_private_notification_iterator *it, + struct bt_private_connection_private_notification_iterator *it, struct bt_private_port *port) { struct ctf_fs_port_data *port_data; @@ -175,7 +215,7 @@ enum bt_notification_iterator_status ctf_fs_iterator_init( goto error; } - notif_iter_data->notif_iter = bt_ctf_notif_iter_create( + notif_iter_data->notif_iter = bt_notif_iter_create( port_data->ds_file_group->ctf_fs_trace->metadata->trace, bt_common_get_page_size() * 8, ctf_fs_ds_file_medops, NULL); @@ -192,8 +232,8 @@ enum bt_notification_iterator_status ctf_fs_iterator_init( goto error; } - ret = bt_private_notification_iterator_set_user_data(it, notif_iter_data); - if (ret) { + ret = bt_private_connection_private_notification_iterator_set_user_data(it, notif_iter_data); + if (ret != BT_NOTIFICATION_ITERATOR_STATUS_OK) { goto error; } @@ -201,11 +241,7 @@ enum bt_notification_iterator_status ctf_fs_iterator_init( goto end; error: - (void) bt_private_notification_iterator_set_user_data(it, NULL); - - if (ret == BT_NOTIFICATION_ITERATOR_STATUS_OK) { - ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; - } + (void) bt_private_connection_private_notification_iterator_set_user_data(it, NULL); end: ctf_fs_notif_iter_data_destroy(notif_iter_data); @@ -300,7 +336,7 @@ GString *get_stream_instance_unique_name( * group, the first (earliest) stream file's path is used as * the stream's unique name. */ - assert(ds_file_group->ds_file_infos->len > 0); + BT_ASSERT(ds_file_group->ds_file_infos->len > 0); ds_file_info = g_ptr_array_index(ds_file_group->ds_file_infos, 0); g_string_assign(name, ds_file_info->path->str); @@ -379,9 +415,9 @@ end: static uint64_t get_packet_header_stream_instance_id(struct ctf_fs_trace *ctf_fs_trace, - struct bt_ctf_field *packet_header_field) + struct bt_field *packet_header_field) { - struct bt_ctf_field *stream_instance_id_field = NULL; + struct bt_field *stream_instance_id_field = NULL; uint64_t stream_instance_id = -1ULL; int ret; @@ -389,13 +425,13 @@ uint64_t get_packet_header_stream_instance_id(struct ctf_fs_trace *ctf_fs_trace, goto end; } - stream_instance_id_field = bt_ctf_field_structure_get_field_by_name( + stream_instance_id_field = bt_field_structure_borrow_field_by_name( packet_header_field, "stream_instance_id"); if (!stream_instance_id_field) { goto end; } - ret = bt_ctf_field_unsigned_integer_get_value(stream_instance_id_field, + ret = bt_field_integer_unsigned_get_value(stream_instance_id_field, &stream_instance_id); if (ret) { stream_instance_id = -1ULL; @@ -403,100 +439,47 @@ uint64_t get_packet_header_stream_instance_id(struct ctf_fs_trace *ctf_fs_trace, } end: - bt_put(stream_instance_id_field); return stream_instance_id; } -struct bt_ctf_stream_class *stream_class_from_packet_header( - struct ctf_fs_trace *ctf_fs_trace, - struct bt_ctf_field *packet_header_field) -{ - struct bt_ctf_field *stream_id_field = NULL; - struct bt_ctf_stream_class *stream_class = NULL; - uint64_t stream_id = -1ULL; - int ret; - - if (!packet_header_field) { - goto single_stream_class; - } - - stream_id_field = bt_ctf_field_structure_get_field_by_name( - packet_header_field, "stream_id"); - if (!stream_id_field) { - goto single_stream_class; - } - - ret = bt_ctf_field_unsigned_integer_get_value(stream_id_field, - &stream_id); - if (ret) { - stream_id = -1ULL; - } - - if (stream_id == -1ULL) { -single_stream_class: - /* Single stream class */ - if (bt_ctf_trace_get_stream_class_count( - ctf_fs_trace->metadata->trace) == 0) { - goto end; - } - - stream_class = bt_ctf_trace_get_stream_class_by_index( - ctf_fs_trace->metadata->trace, 0); - } else { - stream_class = bt_ctf_trace_get_stream_class_by_id( - ctf_fs_trace->metadata->trace, stream_id); - } - -end: - bt_put(stream_id_field); - return stream_class; -} - uint64_t get_packet_context_timestamp_begin_ns( struct ctf_fs_trace *ctf_fs_trace, - struct bt_ctf_field *packet_context_field) + struct bt_field *packet_context_field) { int ret; - struct bt_ctf_field *timestamp_begin_field = NULL; - struct bt_ctf_field_type *timestamp_begin_ft = NULL; + struct bt_field *timestamp_begin_field = NULL; + struct bt_field_type *timestamp_begin_ft = NULL; uint64_t timestamp_begin_raw_value = -1ULL; uint64_t timestamp_begin_ns = -1ULL; int64_t timestamp_begin_ns_signed; - struct bt_ctf_clock_class *timestamp_begin_clock_class = NULL; - struct bt_ctf_clock_value *clock_value = NULL; + struct bt_clock_class *timestamp_begin_clock_class = NULL; if (!packet_context_field) { goto end; } - timestamp_begin_field = bt_ctf_field_structure_get_field_by_name( + timestamp_begin_field = bt_field_structure_borrow_field_by_name( packet_context_field, "timestamp_begin"); if (!timestamp_begin_field) { goto end; } - timestamp_begin_ft = bt_ctf_field_get_type(timestamp_begin_field); - assert(timestamp_begin_ft); + timestamp_begin_ft = bt_field_borrow_type(timestamp_begin_field); + BT_ASSERT(timestamp_begin_ft); timestamp_begin_clock_class = - bt_ctf_field_type_integer_get_mapped_clock_class(timestamp_begin_ft); + bt_field_type_integer_borrow_mapped_clock_class(timestamp_begin_ft); if (!timestamp_begin_clock_class) { goto end; } - ret = bt_ctf_field_unsigned_integer_get_value(timestamp_begin_field, + ret = bt_field_integer_unsigned_get_value(timestamp_begin_field, ×tamp_begin_raw_value); if (ret) { goto end; } - clock_value = bt_ctf_clock_value_create(timestamp_begin_clock_class, - timestamp_begin_raw_value); - if (!clock_value) { - goto end; - } - - ret = bt_ctf_clock_value_get_value_ns_from_epoch(clock_value, - ×tamp_begin_ns_signed); + ret = bt_clock_class_cycles_to_ns(timestamp_begin_clock_class, + timestamp_begin_raw_value, ×tamp_begin_ns_signed); if (ret) { goto end; } @@ -504,10 +487,6 @@ uint64_t get_packet_context_timestamp_begin_ns( timestamp_begin_ns = (uint64_t) timestamp_begin_ns_signed; end: - bt_put(timestamp_begin_field); - bt_put(timestamp_begin_ft); - bt_put(timestamp_begin_clock_class); - bt_put(clock_value); return timestamp_begin_ns; } @@ -572,7 +551,7 @@ void ctf_fs_ds_file_group_destroy(struct ctf_fs_ds_file_group *ds_file_group) static struct ctf_fs_ds_file_group *ctf_fs_ds_file_group_create( struct ctf_fs_trace *ctf_fs_trace, - struct bt_ctf_stream_class *stream_class, + struct bt_stream_class *stream_class, uint64_t stream_instance_id) { struct ctf_fs_ds_file_group *ds_file_group; @@ -589,7 +568,7 @@ struct ctf_fs_ds_file_group *ctf_fs_ds_file_group_create( } ds_file_group->stream_id = stream_instance_id; - assert(stream_class); + BT_ASSERT(stream_class); ds_file_group->stream_class = bt_get(stream_class); ds_file_group->ctf_fs_trace = ctf_fs_trace; goto end; @@ -665,9 +644,9 @@ static int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, const char *path) { - struct bt_ctf_field *packet_header_field = NULL; - struct bt_ctf_field *packet_context_field = NULL; - struct bt_ctf_stream_class *stream_class = NULL; + struct bt_field *packet_header_field = NULL; + struct bt_field *packet_context_field = NULL; + struct bt_stream_class *stream_class = NULL; uint64_t stream_instance_id = -1ULL; uint64_t begin_ns = -1ULL; struct ctf_fs_ds_file_group *ds_file_group = NULL; @@ -676,9 +655,9 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, size_t i; struct ctf_fs_ds_file *ds_file = NULL; struct ctf_fs_ds_index *index = NULL; - struct bt_ctf_notif_iter *notif_iter = NULL; + struct bt_notif_iter *notif_iter = NULL; - notif_iter = bt_ctf_notif_iter_create(ctf_fs_trace->metadata->trace, + notif_iter = bt_notif_iter_create(ctf_fs_trace->metadata->trace, bt_common_get_page_size() * 8, ctf_fs_ds_file_medops, NULL); if (!notif_iter) { BT_LOGE_STR("Cannot create a CTF notification iterator."); @@ -690,7 +669,7 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, goto error; } - ret = ctf_fs_ds_file_get_packet_header_context_fields(ds_file, + ret = ctf_fs_ds_file_borrow_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`).", @@ -702,8 +681,8 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, packet_header_field); begin_ns = get_packet_context_timestamp_begin_ns(ctf_fs_trace, packet_context_field); - stream_class = stream_class_from_packet_header(ctf_fs_trace, - packet_header_field); + stream_class = ctf_utils_borrow_stream_class_from_packet_header( + ctf_fs_trace->metadata->trace, packet_header_field); if (!stream_class) { goto error; } @@ -749,8 +728,8 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, goto end; } - assert(stream_instance_id != -1ULL); - assert(begin_ns != -1ULL); + BT_ASSERT(stream_instance_id != -1ULL); + BT_ASSERT(begin_ns != -1ULL); /* Find an existing stream file group with this ID */ for (i = 0; i < ctf_fs_trace->ds_file_groups->len; i++) { @@ -797,13 +776,10 @@ end: ctf_fs_ds_file_destroy(ds_file); if (notif_iter) { - bt_ctf_notif_iter_destroy(notif_iter); + bt_notif_iter_destroy(notif_iter); } ctf_fs_ds_index_destroy(index); - bt_put(packet_header_field); - bt_put(packet_context_field); - bt_put(stream_class); return ret; } @@ -830,13 +806,13 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace) if (!strcmp(basename, CTF_FS_METADATA_FILENAME)) { /* Ignore the metadata stream. */ - BT_LOGD("Ignoring metadata file `%s/%s`", + BT_LOGD("Ignoring metadata file `%s" G_DIR_SEPARATOR_S "%s`", ctf_fs_trace->path->str, basename); continue; } if (basename[0] == '.') { - BT_LOGD("Ignoring hidden file `%s/%s`", + BT_LOGD("Ignoring hidden file `%s" G_DIR_SEPARATOR_S "%s`", ctf_fs_trace->path->str, basename); continue; } @@ -844,13 +820,13 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace) /* Create the file. */ file = ctf_fs_file_create(); if (!file) { - BT_LOGE("Cannot create stream file object for file `%s/%s`", + BT_LOGE("Cannot create stream file object for file `%s" G_DIR_SEPARATOR_S "%s`", ctf_fs_trace->path->str, basename); goto error; } /* Create full path string. */ - g_string_append_printf(file->path, "%s/%s", + 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_LOGD("Ignoring non-regular file `%s`", @@ -902,12 +878,14 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace) } if (ds_file_group->stream_id == -1ULL) { - /* No stream ID */ - ds_file_group->stream = bt_ctf_stream_create( - ds_file_group->stream_class, name->str); + /* No stream ID: use 0 */ + ds_file_group->stream = bt_stream_create( + ds_file_group->stream_class, name->str, + ctf_fs_trace->next_stream_id); + ctf_fs_trace->next_stream_id++; } else { /* Specific stream ID */ - ds_file_group->stream = bt_ctf_stream_create_with_id( + ds_file_group->stream = bt_stream_create( ds_file_group->stream_class, name->str, ds_file_group->stream_id); } @@ -947,26 +925,25 @@ int create_cc_prio_map(struct ctf_fs_trace *ctf_fs_trace) size_t i; int count; - assert(ctf_fs_trace); + BT_ASSERT(ctf_fs_trace); ctf_fs_trace->cc_prio_map = bt_clock_class_priority_map_create(); if (!ctf_fs_trace->cc_prio_map) { ret = -1; goto end; } - count = bt_ctf_trace_get_clock_class_count( + count = bt_trace_get_clock_class_count( ctf_fs_trace->metadata->trace); - assert(count >= 0); + BT_ASSERT(count >= 0); for (i = 0; i < count; i++) { - struct bt_ctf_clock_class *clock_class = - bt_ctf_trace_get_clock_class_by_index( + struct bt_clock_class *clock_class = + bt_trace_borrow_clock_class_by_index( ctf_fs_trace->metadata->trace, i); - assert(clock_class); + BT_ASSERT(clock_class); ret = bt_clock_class_priority_map_add_clock_class( ctf_fs_trace->cc_prio_map, clock_class, 0); - BT_PUT(clock_class); if (ret) { goto end; @@ -1030,7 +1007,7 @@ 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_ctf_trace_set_is_static(ctf_fs_trace->metadata->trace); + (void) bt_trace_set_is_static(ctf_fs_trace->metadata->trace); goto end; @@ -1052,7 +1029,7 @@ int path_is_ctf_trace(const char *path) goto end; } - g_string_printf(metadata_path, "%s/%s", path, CTF_FS_METADATA_FILENAME); + g_string_printf(metadata_path, "%s" G_DIR_SEPARATOR_S "%s", path, CTF_FS_METADATA_FILENAME); if (g_file_test(metadata_path->str, G_FILE_TEST_IS_REGULAR)) { ret = 1; @@ -1077,6 +1054,7 @@ int add_trace_path(GList **trace_paths, const char *path) goto end; } + // FIXME: Remove or ifdef for __MINGW32__ if (strcmp(norm_path->str, "/") == 0) { BT_LOGE("Opening a trace in `/` is not supported."); ret = -1; @@ -1084,7 +1062,7 @@ int add_trace_path(GList **trace_paths, const char *path) } *trace_paths = g_list_prepend(*trace_paths, norm_path); - assert(*trace_paths); + BT_ASSERT(*trace_paths); norm_path = NULL; end: @@ -1146,7 +1124,7 @@ int ctf_fs_find_traces(GList **trace_paths, const char *start_path) goto end; } - g_string_printf(sub_path, "%s/%s", start_path, basename); + g_string_printf(sub_path, "%s" G_DIR_SEPARATOR_S "%s", start_path, basename); ret = ctf_fs_find_traces(trace_paths, sub_path->str); g_string_free(sub_path, TRUE); if (ret) { @@ -1201,7 +1179,7 @@ GList *ctf_fs_create_trace_names(GList *trace_paths, const char *base_path) { last_sep = strrchr(base_path, G_DIR_SEPARATOR); /* We know there's at least one separator */ - assert(last_sep); + BT_ASSERT(last_sep); /* Distance to base */ base_dist = last_sep - base_path + 1; @@ -1211,7 +1189,7 @@ GList *ctf_fs_create_trace_names(GList *trace_paths, const char *base_path) { GString *trace_name = g_string_new(NULL); GString *trace_path = node->data; - assert(trace_name); + BT_ASSERT(trace_name); g_string_assign(trace_name, &trace_path->str[base_dist]); trace_names = g_list_append(trace_names, trace_name); } @@ -1328,7 +1306,7 @@ struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp, } ret = bt_private_component_set_user_data(priv_comp, ctf_fs); - assert(ret == BT_COMPONENT_STATUS_OK); + BT_ASSERT(ret == BT_COMPONENT_STATUS_OK); /* * We don't need to get a new reference here because as long as @@ -1336,15 +1314,14 @@ struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp, * private component should also exist. */ ctf_fs->priv_comp = priv_comp; - value = bt_value_map_get(params, "path"); - if (!bt_value_is_string(value)) { + value = bt_value_map_borrow(params, "path"); + if (value && !bt_value_is_string(value)) { goto error; } value_ret = bt_value_string_get(value, &path_param); - assert(value_ret == BT_VALUE_STATUS_OK); - BT_PUT(value); - value = bt_value_map_get(params, "clock-class-offset-s"); + BT_ASSERT(value_ret == BT_VALUE_STATUS_OK); + value = bt_value_map_borrow(params, "clock-class-offset-s"); if (value) { if (!bt_value_is_integer(value)) { BT_LOGE("clock-class-offset-s should be an integer"); @@ -1352,11 +1329,10 @@ struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp, } value_ret = bt_value_integer_get(value, &ctf_fs->metadata_config.clock_class_offset_s); - assert(value_ret == BT_VALUE_STATUS_OK); - BT_PUT(value); + BT_ASSERT(value_ret == BT_VALUE_STATUS_OK); } - value = bt_value_map_get(params, "clock-class-offset-ns"); + value = bt_value_map_borrow(params, "clock-class-offset-ns"); if (value) { if (!bt_value_is_integer(value)) { BT_LOGE("clock-class-offset-ns should be an integer"); @@ -1364,8 +1340,7 @@ struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp, } value_ret = bt_value_integer_get(value, &ctf_fs->metadata_config.clock_class_offset_ns); - assert(value_ret == BT_VALUE_STATUS_OK); - BT_PUT(value); + BT_ASSERT(value_ret == BT_VALUE_STATUS_OK); } ctf_fs->port_data = g_ptr_array_new_with_free_func(port_data_destroy); @@ -1389,10 +1364,9 @@ error: ctf_fs_destroy(ctf_fs); ctf_fs = NULL; ret = bt_private_component_set_user_data(priv_comp, NULL); - assert(ret == BT_COMPONENT_STATUS_OK); + BT_ASSERT(ret == BT_COMPONENT_STATUS_OK); end: - bt_put(value); return ctf_fs; } @@ -1412,19 +1386,25 @@ enum bt_component_status ctf_fs_init(struct bt_private_component *priv_comp, } BT_HIDDEN -struct bt_value *ctf_fs_query(struct bt_component_class *comp_class, +struct bt_component_class_query_method_return ctf_fs_query( + struct bt_component_class *comp_class, + struct bt_query_executor *query_exec, const char *object, struct bt_value *params) { - struct bt_value *result = NULL; + struct bt_component_class_query_method_return ret = { + .result = NULL, + .status = BT_QUERY_STATUS_OK, + }; if (!strcmp(object, "metadata-info")) { - result = metadata_info_query(comp_class, params); + ret = metadata_info_query(comp_class, params); } else if (!strcmp(object, "trace-info")) { - result = trace_info_query(comp_class, params); + ret = trace_info_query(comp_class, params); } else { BT_LOGE("Unknown query object `%s`", object); + ret.status = BT_QUERY_STATUS_INVALID_OBJECT; goto end; } end: - return result; + return ret; }