X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Ffs.c;h=46086905259d8d9869249b60892a978b60eda76f;hb=229f76ed6210c9f71d8e7dc3176bd81aa5824c86;hp=c97013eae7b3eb76a4719c5e2c44c40700e73b1a;hpb=fe7265b50927fe05576f8c5cedaea1d8433d8a02;p=babeltrace.git diff --git a/plugins/ctf/fs-src/fs.c b/plugins/ctf/fs-src/fs.c index c97013ea..46086905 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" @@ -47,7 +37,7 @@ #include "data-stream-file.h" #include "file.h" #include "../common/metadata/decoder.h" -#include "../common/notif-iter/notif-iter.h" +#include "../common/msg-iter/msg-iter.h" #include "../common/utils/utils.h" #include "query.h" @@ -55,24 +45,25 @@ #include "logging.h" static -int notif_iter_data_set_current_ds_file(struct ctf_fs_notif_iter_data *notif_iter_data) +int msg_iter_data_set_current_ds_file(struct ctf_fs_msg_iter_data *msg_iter_data) { struct ctf_fs_ds_file_info *ds_file_info; int ret = 0; - assert(notif_iter_data->ds_file_info_index < - notif_iter_data->ds_file_group->ds_file_infos->len); + BT_ASSERT(msg_iter_data->ds_file_info_index < + msg_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, - notif_iter_data->ds_file_info_index); - - ctf_fs_ds_file_destroy(notif_iter_data->ds_file); - notif_iter_data->ds_file = ctf_fs_ds_file_create( - notif_iter_data->ds_file_group->ctf_fs_trace, - notif_iter_data->notif_iter, - notif_iter_data->ds_file_group->stream, + msg_iter_data->ds_file_group->ds_file_infos, + msg_iter_data->ds_file_info_index); + + ctf_fs_ds_file_destroy(msg_iter_data->ds_file); + msg_iter_data->ds_file = ctf_fs_ds_file_create( + msg_iter_data->ds_file_group->ctf_fs_trace, + msg_iter_data->pc_msg_iter, + msg_iter_data->msg_iter, + msg_iter_data->ds_file_group->stream, ds_file_info->path->str); - if (!notif_iter_data->ds_file) { + if (!msg_iter_data->ds_file) { ret = -1; } @@ -80,132 +71,225 @@ int notif_iter_data_set_current_ds_file(struct ctf_fs_notif_iter_data *notif_ite } static -void ctf_fs_notif_iter_data_destroy( - struct ctf_fs_notif_iter_data *notif_iter_data) +void ctf_fs_msg_iter_data_destroy( + struct ctf_fs_msg_iter_data *msg_iter_data) { - if (!notif_iter_data) { + if (!msg_iter_data) { return; } - ctf_fs_ds_file_destroy(notif_iter_data->ds_file); + ctf_fs_ds_file_destroy(msg_iter_data->ds_file); - if (notif_iter_data->notif_iter) { - bt_ctf_notif_iter_destroy(notif_iter_data->notif_iter); + if (msg_iter_data->msg_iter) { + bt_msg_iter_destroy(msg_iter_data->msg_iter); } - g_free(notif_iter_data); + g_free(msg_iter_data); } -struct bt_notification_iterator_next_method_return ctf_fs_iterator_next( - struct bt_private_connection_private_notification_iterator *iterator) +static +bt_self_message_iterator_status ctf_fs_iterator_next_one( + struct ctf_fs_msg_iter_data *msg_iter_data, + const bt_message **msg) { - struct bt_notification_iterator_next_method_return next_ret; - struct ctf_fs_notif_iter_data *notif_iter_data = - bt_private_connection_private_notification_iterator_get_user_data(iterator); + bt_self_message_iterator_status status; + bt_message *priv_msg; int ret; - 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); - notif_iter_data->ds_file_info_index++; + BT_ASSERT(msg_iter_data->ds_file); + status = ctf_fs_ds_file_next(msg_iter_data->ds_file, &priv_msg); + *msg = priv_msg; + + if (status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK && + bt_message_get_type(*msg) == + BT_MESSAGE_TYPE_STREAM_BEGINNING) { + if (msg_iter_data->skip_stream_begin_msgs) { + /* + * We already emitted a + * BT_MESSAGE_TYPE_STREAM_BEGINNING + * message: skip this one, get a new one. + */ + BT_MESSAGE_PUT_REF_AND_RESET(*msg); + status = ctf_fs_ds_file_next(msg_iter_data->ds_file, + &priv_msg); + *msg = priv_msg; + BT_ASSERT(status != BT_SELF_MESSAGE_ITERATOR_STATUS_END); + goto end; + } else { + /* + * First BT_MESSAGE_TYPE_STREAM_BEGINNING + * message: skip all following. + */ + msg_iter_data->skip_stream_begin_msgs = true; + goto end; + } + } + + if (status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK && + bt_message_get_type(*msg) == + BT_MESSAGE_TYPE_STREAM_END) { + msg_iter_data->ds_file_info_index++; - if (notif_iter_data->ds_file_info_index == - notif_iter_data->ds_file_group->ds_file_infos->len) { + if (msg_iter_data->ds_file_info_index == + msg_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_MESSAGE_TYPE_STREAM_END message. + * The next time ctf_fs_iterator_next() is + * called for this message iterator, + * ctf_fs_ds_file_next() will return + * BT_SELF_MESSAGE_ITERATOR_STATUS_END(). */ goto end; } + BT_MESSAGE_PUT_REF_AND_RESET(*msg); + bt_msg_iter_reset(msg_iter_data->msg_iter); + /* * Open and start reading the next stream file within * our stream file group. */ - ret = notif_iter_data_set_current_ds_file(notif_iter_data); + ret = msg_iter_data_set_current_ds_file(msg_iter_data); if (ret) { - next_ret.status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; + status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR; goto end; } - next_ret = ctf_fs_ds_file_next(notif_iter_data->ds_file); + status = ctf_fs_ds_file_next(msg_iter_data->ds_file, &priv_msg); + *msg = priv_msg; /* - * 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 message, we expect to get a + * BT_MESSAGE_TYPE_STREAM_BEGINNING message + * because the iterator's state machine emits one before + * even requesting the first block of data from the + * medium. Skip this message because we're not + * really starting a new stream here, and try getting a + * new message (which, if it works, is a + * BT_MESSAGE_TYPE_PACKET_BEGINNING one). We're sure to + * get at least one pair of + * BT_MESSAGE_TYPE_PACKET_BEGINNING and + * BT_MESSAGE_TYPE_PACKET_END messages 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(msg_iter_data->skip_stream_begin_msgs); + + if (status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) { + BT_ASSERT(bt_message_get_type(*msg) == + BT_MESSAGE_TYPE_STREAM_BEGINNING); + BT_MESSAGE_PUT_REF_AND_RESET(*msg); + status = ctf_fs_ds_file_next(msg_iter_data->ds_file, + &priv_msg); + *msg = priv_msg; + BT_ASSERT(status != BT_SELF_MESSAGE_ITERATOR_STATUS_END); + } } end: - return next_ret; + return status; } -void ctf_fs_iterator_finalize(struct bt_private_connection_private_notification_iterator *it) +BT_HIDDEN +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) { - void *notif_iter_data = - bt_private_connection_private_notification_iterator_get_user_data(it); + 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); + uint64_t i = 0; + + while (i < capacity && status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) { + status = ctf_fs_iterator_next_one(msg_iter_data, &msgs[i]); + if (status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) { + i++; + } + } + + if (i > 0) { + /* + * Even if ctf_fs_iterator_next_one() returned something + * else than BT_SELF_MESSAGE_ITERATOR_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 + * 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; + } + + return status; +} - ctf_fs_notif_iter_data_destroy(notif_iter_data); +void ctf_fs_iterator_finalize(bt_self_message_iterator *it) +{ + ctf_fs_msg_iter_data_destroy( + bt_self_message_iterator_get_data(it)); } -enum bt_notification_iterator_status ctf_fs_iterator_init( - struct bt_private_connection_private_notification_iterator *it, - struct bt_private_port *port) +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_notif_iter_data *notif_iter_data = NULL; - enum bt_notification_iterator_status ret = - BT_NOTIFICATION_ITERATOR_STATUS_OK; + struct ctf_fs_msg_iter_data *msg_iter_data = NULL; + bt_self_message_iterator_status ret = + BT_SELF_MESSAGE_ITERATOR_STATUS_OK; int iret; - port_data = bt_private_port_get_user_data(port); - if (!port_data) { - ret = BT_NOTIFICATION_ITERATOR_STATUS_INVALID; - goto error; - } - - notif_iter_data = g_new0(struct ctf_fs_notif_iter_data, 1); - if (!notif_iter_data) { - ret = BT_NOTIFICATION_ITERATOR_STATUS_NOMEM; + port_data = bt_self_component_port_get_data( + bt_self_component_port_output_as_self_component_port( + self_port)); + BT_ASSERT(port_data); + msg_iter_data = g_new0(struct ctf_fs_msg_iter_data, 1); + if (!msg_iter_data) { + ret = BT_SELF_MESSAGE_ITERATOR_STATUS_NOMEM; goto error; } - notif_iter_data->notif_iter = bt_ctf_notif_iter_create( - port_data->ds_file_group->ctf_fs_trace->metadata->trace, + 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() * 8, ctf_fs_ds_file_medops, NULL); - if (!notif_iter_data->notif_iter) { - BT_LOGE_STR("Cannot create a CTF notification iterator."); - ret = BT_NOTIFICATION_ITERATOR_STATUS_NOMEM; + if (!msg_iter_data->msg_iter) { + BT_LOGE_STR("Cannot create a CTF message iterator."); + ret = BT_SELF_MESSAGE_ITERATOR_STATUS_NOMEM; goto error; } - notif_iter_data->ds_file_group = port_data->ds_file_group; - iret = notif_iter_data_set_current_ds_file(notif_iter_data); + msg_iter_data->ds_file_group = port_data->ds_file_group; + iret = msg_iter_data_set_current_ds_file(msg_iter_data); if (iret) { - ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; + ret = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR; goto error; } - ret = bt_private_connection_private_notification_iterator_set_user_data(it, notif_iter_data); - if (ret != BT_NOTIFICATION_ITERATOR_STATUS_OK) { + bt_self_message_iterator_set_data(self_msg_iter, + msg_iter_data); + if (ret != BT_SELF_MESSAGE_ITERATOR_STATUS_OK) { goto error; } - notif_iter_data = NULL; + msg_iter_data = NULL; goto end; error: - (void) bt_private_connection_private_notification_iterator_set_user_data(it, NULL); + bt_self_message_iterator_set_data(self_msg_iter, NULL); end: - ctf_fs_notif_iter_data_destroy(notif_iter_data); + ctf_fs_msg_iter_data_destroy(msg_iter_data); return ret; } @@ -238,6 +322,8 @@ void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace) g_ptr_array_free(ctf_fs_trace->ds_file_groups, TRUE); } + BT_TRACE_PUT_REF_AND_RESET(ctf_fs_trace->trace); + if (ctf_fs_trace->path) { g_string_free(ctf_fs_trace->path, TRUE); } @@ -251,7 +337,6 @@ void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace) g_free(ctf_fs_trace->metadata); } - bt_put(ctf_fs_trace->cc_prio_map); g_free(ctf_fs_trace); } @@ -262,11 +347,10 @@ void ctf_fs_trace_destroy_notifier(void *data) ctf_fs_trace_destroy(trace); } -void ctf_fs_finalize(struct bt_private_component *component) +void ctf_fs_finalize(bt_self_component_source *component) { - void *data = bt_private_component_get_user_data(component); - - ctf_fs_destroy(data); + ctf_fs_destroy(bt_self_component_get_data( + bt_self_component_source_as_self_component(component))); } static @@ -297,7 +381,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); @@ -327,9 +411,10 @@ int create_one_port_for_trace(struct ctf_fs_component *ctf_fs, goto error; } + port_data->ctf_fs = ctf_fs; port_data->ds_file_group = ds_file_group; - ret = bt_private_component_source_add_output_private_port( - ctf_fs->priv_comp, port_name->str, port_data, NULL); + ret = bt_self_component_source_add_output_port( + ctf_fs->self_comp, port_name->str, port_data, NULL); if (ret) { goto error; } @@ -374,95 +459,6 @@ end: return ret; } -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_ctf_field *stream_instance_id_field = NULL; - uint64_t stream_instance_id = -1ULL; - int ret; - - if (!packet_header_field) { - goto end; - } - - stream_instance_id_field = bt_ctf_field_structure_get_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, - &stream_instance_id); - if (ret) { - stream_instance_id = -1ULL; - goto end; - } - -end: - bt_put(stream_instance_id_field); - return stream_instance_id; -} - -uint64_t get_packet_context_timestamp_begin_ns( - struct ctf_fs_trace *ctf_fs_trace, - struct bt_ctf_field *packet_context_field) -{ - int ret; - struct bt_ctf_field *timestamp_begin_field = NULL; - struct bt_ctf_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; - - if (!packet_context_field) { - goto end; - } - - timestamp_begin_field = bt_ctf_field_structure_get_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_clock_class = - bt_ctf_field_type_integer_get_mapped_clock_class(timestamp_begin_ft); - if (!timestamp_begin_clock_class) { - goto end; - } - - ret = bt_ctf_field_unsigned_integer_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); - if (ret) { - goto end; - } - - 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; -} - static void ctf_fs_ds_file_info_destroy(struct ctf_fs_ds_file_info *ds_file_info) { @@ -480,7 +476,7 @@ void ctf_fs_ds_file_info_destroy(struct ctf_fs_ds_file_info *ds_file_info) static struct ctf_fs_ds_file_info *ctf_fs_ds_file_info_create(const char *path, - uint64_t begin_ns, struct ctf_fs_ds_index *index) + int64_t begin_ns, struct ctf_fs_ds_index *index) { struct ctf_fs_ds_file_info *ds_file_info; @@ -516,15 +512,15 @@ void ctf_fs_ds_file_group_destroy(struct ctf_fs_ds_file_group *ds_file_group) g_ptr_array_free(ds_file_group->ds_file_infos, TRUE); } - bt_put(ds_file_group->stream); - bt_put(ds_file_group->stream_class); + bt_stream_put_ref(ds_file_group->stream); + bt_stream_class_put_ref(ds_file_group->stream_class); g_free(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, + bt_stream_class *stream_class, uint64_t stream_instance_id) { struct ctf_fs_ds_file_group *ds_file_group; @@ -541,8 +537,9 @@ struct ctf_fs_ds_file_group *ctf_fs_ds_file_group_create( } ds_file_group->stream_id = stream_instance_id; - assert(stream_class); - ds_file_group->stream_class = bt_get(stream_class); + BT_ASSERT(stream_class); + ds_file_group->stream_class = stream_class; + bt_stream_class_get_ref(ds_file_group->stream_class); ds_file_group->ctf_fs_trace = ctf_fs_trace; goto end; @@ -577,7 +574,7 @@ void array_insert(GPtrArray *array, gpointer element, size_t pos) 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, int64_t begin_ns, struct ctf_fs_ds_index *index) { struct ctf_fs_ds_file_info *ds_file_info; @@ -617,47 +614,58 @@ 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; - uint64_t stream_instance_id = -1ULL; - uint64_t begin_ns = -1ULL; + bt_stream_class *stream_class = NULL; + int64_t stream_instance_id = -1; + int64_t begin_ns = -1; struct ctf_fs_ds_file_group *ds_file_group = NULL; bool add_group = false; int ret; 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_msg_iter *msg_iter = NULL; + struct ctf_stream_class *sc = NULL; + struct bt_msg_iter_packet_properties props; - notif_iter = bt_ctf_notif_iter_create(ctf_fs_trace->metadata->trace, + msg_iter = bt_msg_iter_create(ctf_fs_trace->metadata->tc, bt_common_get_page_size() * 8, ctf_fs_ds_file_medops, NULL); - if (!notif_iter) { - BT_LOGE_STR("Cannot create a CTF notification iterator."); + if (!msg_iter) { + BT_LOGE_STR("Cannot create a CTF message iterator."); goto error; } - ds_file = ctf_fs_ds_file_create(ctf_fs_trace, notif_iter, NULL, path); + ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, msg_iter, + NULL, path); if (!ds_file) { goto error; } - ret = ctf_fs_ds_file_get_packet_header_context_fields(ds_file, - &packet_header_field, &packet_context_field); + 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; } - stream_instance_id = get_packet_header_stream_instance_id(ctf_fs_trace, - packet_header_field); - begin_ns = get_packet_context_timestamp_begin_ns(ctf_fs_trace, - packet_context_field); - stream_class = ctf_utils_stream_class_from_packet_header( - ctf_fs_trace->metadata->trace, packet_header_field); - if (!stream_class) { - goto error; + sc = ctf_trace_class_borrow_stream_class_by_id(ds_file->metadata->tc, + props.stream_class_id); + BT_ASSERT(sc); + stream_class = sc->ir_sc; + BT_ASSERT(stream_class); + stream_instance_id = props.data_stream_id; + + if (props.snapshots.beginning_clock != UINT64_C(-1)) { + BT_ASSERT(sc->default_clock_class); + 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); + goto error; + } } index = ctf_fs_ds_file_build_index(ds_file); @@ -666,16 +674,16 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, ds_file->file->path->str); } - if (begin_ns == -1ULL) { + if (begin_ns == -1) { /* * No beggining timestamp to sort the stream files * within a stream file group, so consider that this * file must be the only one within its group. */ - stream_instance_id = -1ULL; + stream_instance_id = -1; } - if (stream_instance_id == -1ULL) { + if (stream_instance_id == -1) { /* * No stream instance ID or no beginning timestamp: * create a unique stream file group for this stream @@ -701,8 +709,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 != -1); + BT_ASSERT(begin_ns != -1); /* Find an existing stream file group with this ID */ for (i = 0; i < ctf_fs_trace->ds_file_groups->len; i++) { @@ -748,14 +756,11 @@ end: ctf_fs_ds_file_destroy(ds_file); - if (notif_iter) { - bt_ctf_notif_iter_destroy(notif_iter); + if (msg_iter) { + bt_msg_iter_destroy(msg_iter); } ctf_fs_ds_index_destroy(index); - bt_put(packet_header_field); - bt_put(packet_context_field); - bt_put(stream_class); return ret; } @@ -837,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 @@ -853,25 +862,40 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace) goto error; } - 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); + if (ds_file_group->stream_id == UINT64_C(-1)) { + /* No stream ID: use 0 */ + ds_file_group->stream = bt_stream_create_with_id( + ds_file_group->stream_class, + ctf_fs_trace->trace, + 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_class, name->str, - ds_file_group->stream_id); + ds_file_group->stream = bt_stream_create_with_id( + ds_file_group->stream_class, + ctf_fs_trace->trace, + (uint64_t) ds_file_group->stream_id); } - g_string_free(name, TRUE); - if (!ds_file_group->stream) { BT_LOGE("Cannot create stream for DS file group: " "addr=%p, stream-name=\"%s\"", ds_file_group, name->str); + g_string_free(name, TRUE); goto error; } + + ret = bt_stream_set_name(ds_file_group->stream, + name->str); + if (ret) { + BT_LOGE("Cannot set stream's name: " + "addr=%p, stream-name=\"%s\"", + ds_file_group->stream, name->str); + g_string_free(name, TRUE); + goto error; + } + + g_string_free(name, TRUE); } goto end; @@ -893,44 +917,56 @@ end: } static -int create_cc_prio_map(struct ctf_fs_trace *ctf_fs_trace) +int set_trace_name(bt_trace *trace, const char *name_suffix) { int ret = 0; - size_t i; - int count; + const bt_trace_class *tc = bt_trace_borrow_class_const(trace); + const bt_value *val; + GString *name; - assert(ctf_fs_trace); - ctf_fs_trace->cc_prio_map = bt_clock_class_priority_map_create(); - if (!ctf_fs_trace->cc_prio_map) { + name = g_string_new(NULL); + if (!name) { + BT_LOGE_STR("Failed to allocate a GString."); ret = -1; goto end; } - count = bt_ctf_trace_get_clock_class_count( - ctf_fs_trace->metadata->trace); - assert(count >= 0); + /* + * 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"); + if (val && bt_value_is_string(val)) { + g_string_append(name, bt_value_string_get(val)); - for (i = 0; i < count; i++) { - struct bt_ctf_clock_class *clock_class = - bt_ctf_trace_get_clock_class_by_index( - ctf_fs_trace->metadata->trace, i); + if (name_suffix) { + g_string_append_c(name, G_DIR_SEPARATOR); + } + } - 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 (name_suffix) { + g_string_append(name, name_suffix); + } - if (ret) { - goto end; - } + ret = bt_trace_set_name(trace, name->str); + if (ret) { + goto end; } + goto end; + end: + if (name) { + g_string_free(name, TRUE); + } + return ret; } 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; @@ -956,23 +992,35 @@ struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name, goto error; } + ctf_fs_metadata_init(ctf_fs_trace->metadata); ctf_fs_trace->ds_file_groups = g_ptr_array_new_with_free_func( (GDestroyNotify) ctf_fs_ds_file_group_destroy); if (!ctf_fs_trace->ds_file_groups) { goto error; } - ret = ctf_fs_metadata_set_trace(ctf_fs_trace, metadata_config); + ret = ctf_fs_metadata_set_trace_class(self_comp, + ctf_fs_trace, metadata_config); if (ret) { goto error; } - ret = create_ds_file_groups(ctf_fs_trace); - if (ret) { - 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 = create_cc_prio_map(ctf_fs_trace); + 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); if (ret) { goto error; } @@ -982,13 +1030,16 @@ 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); + if (ctf_fs_trace->trace) { + (void) bt_trace_make_static(ctf_fs_trace->trace); + } goto end; error: ctf_fs_trace_destroy(ctf_fs_trace); ctf_fs_trace = NULL; + end: return ctf_fs_trace; } @@ -1037,7 +1088,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: @@ -1154,7 +1205,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; @@ -1164,7 +1215,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); } @@ -1173,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; @@ -1214,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); @@ -1266,59 +1319,53 @@ end: } static -struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp, - struct bt_value *params) +struct ctf_fs_component *ctf_fs_create( + bt_self_component_source *self_comp, + const bt_value *params) { struct ctf_fs_component *ctf_fs; - struct bt_value *value = NULL; + const bt_value *value = NULL; const char *path_param; - enum bt_component_status ret; - enum bt_value_status value_ret; ctf_fs = g_new0(struct ctf_fs_component, 1); if (!ctf_fs) { goto end; } - ret = bt_private_component_set_user_data(priv_comp, ctf_fs); - assert(ret == BT_COMPONENT_STATUS_OK); + 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. */ - ctf_fs->priv_comp = priv_comp; - value = bt_value_map_get(params, "path"); - if (!bt_value_is_string(value)) { + ctf_fs->self_comp = self_comp; + value = bt_value_map_borrow_entry_value_const(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"); + path_param = bt_value_string_get(value); + value = bt_value_map_borrow_entry_value_const(params, + "clock-class-offset-s"); if (value) { if (!bt_value_is_integer(value)) { BT_LOGE("clock-class-offset-s should be an integer"); goto error; } - 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); + ctf_fs->metadata_config.clock_class_offset_s = bt_value_integer_get(value); } - value = bt_value_map_get(params, "clock-class-offset-ns"); + value = bt_value_map_borrow_entry_value_const(params, + "clock-class-offset-ns"); if (value) { if (!bt_value_is_integer(value)) { BT_LOGE("clock-class-offset-ns should be an integer"); goto error; } - 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); + ctf_fs->metadata_config.clock_class_offset_ns = bt_value_integer_get(value); } ctf_fs->port_data = g_ptr_array_new_with_free_func(port_data_destroy); @@ -1332,7 +1379,7 @@ struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp, goto error; } - if (create_ctf_fs_traces(ctf_fs, path_param)) { + if (create_ctf_fs_traces(self_comp, ctf_fs, path_param)) { goto error; } @@ -1341,49 +1388,48 @@ struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp, 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_self_component_set_data( + bt_self_component_source_as_self_component(self_comp), + NULL); end: - bt_put(value); return ctf_fs; } BT_HIDDEN -enum bt_component_status ctf_fs_init(struct bt_private_component *priv_comp, - struct bt_value *params, UNUSED_VAR void *init_method_data) +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_component_status ret = BT_COMPONENT_STATUS_OK; + bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK; - ctf_fs = ctf_fs_create(priv_comp, params); + ctf_fs = ctf_fs_create(self_comp, params); if (!ctf_fs) { - ret = BT_COMPONENT_STATUS_ERROR; + ret = BT_SELF_COMPONENT_STATUS_ERROR; } return ret; } BT_HIDDEN -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) +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) { - struct bt_component_class_query_method_return ret = { - .result = NULL, - .status = BT_QUERY_STATUS_OK, - }; + bt_query_status status = BT_QUERY_STATUS_OK; if (!strcmp(object, "metadata-info")) { - ret = metadata_info_query(comp_class, params); + status = metadata_info_query(comp_class, params, result); } else if (!strcmp(object, "trace-info")) { - ret = trace_info_query(comp_class, params); + status = trace_info_query(comp_class, params, result); } else { BT_LOGE("Unknown query object `%s`", object); - ret.status = BT_QUERY_STATUS_INVALID_OBJECT; + status = BT_QUERY_STATUS_INVALID_OBJECT; goto end; } end: - return ret; + return status; }