X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Ffs.c;h=07b4c049fc28bbd0ca155f6ab239a1921197f965;hp=74e9b52aaf9fe04d7418bb6e40e0f3358642fd40;hb=312c056ae3d374b253fa0cfe5ed576c0b0e5e569;hpb=f6ccaed94e575af57fe6bf38154771bee4871a2a diff --git a/plugins/ctf/fs-src/fs.c b/plugins/ctf/fs-src/fs.c index 74e9b52a..07b4c049 100644 --- a/plugins/ctf/fs-src/fs.c +++ b/plugins/ctf/fs-src/fs.c @@ -96,19 +96,52 @@ struct bt_notification_iterator_next_method_return ctf_fs_iterator_next( 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) { - BT_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. @@ -122,14 +155,30 @@ struct bt_notification_iterator_next_method_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. */ - BT_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: @@ -376,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_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_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; @@ -390,7 +439,6 @@ 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; } @@ -405,40 +453,33 @@ uint64_t get_packet_context_timestamp_begin_ns( uint64_t timestamp_begin_ns = -1ULL; int64_t timestamp_begin_ns_signed; struct bt_clock_class *timestamp_begin_clock_class = NULL; - struct bt_clock_value *clock_value = NULL; if (!packet_context_field) { goto end; } - timestamp_begin_field = bt_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_field_get_type(timestamp_begin_field); + timestamp_begin_ft = bt_field_borrow_type(timestamp_begin_field); BT_ASSERT(timestamp_begin_ft); timestamp_begin_clock_class = - bt_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_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_clock_value_create(timestamp_begin_clock_class, - timestamp_begin_raw_value); - if (!clock_value) { - goto end; - } - - ret = bt_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; } @@ -446,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; } @@ -632,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`).", @@ -644,7 +681,7 @@ 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 = ctf_utils_stream_class_from_packet_header( + stream_class = ctf_utils_borrow_stream_class_from_packet_header( ctf_fs_trace->metadata->trace, packet_header_field); if (!stream_class) { goto error; @@ -743,9 +780,6 @@ end: } ctf_fs_ds_index_destroy(index); - bt_put(packet_header_field); - bt_put(packet_context_field); - bt_put(stream_class); return ret; } @@ -844,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 */ + /* No stream ID: use 0 */ ds_file_group->stream = bt_stream_create( - ds_file_group->stream_class, name->str); + 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_stream_create_with_id( + ds_file_group->stream = bt_stream_create( ds_file_group->stream_class, name->str, ds_file_group->stream_id); } @@ -902,13 +938,12 @@ int create_cc_prio_map(struct ctf_fs_trace *ctf_fs_trace) for (i = 0; i < count; i++) { struct bt_clock_class *clock_class = - bt_trace_get_clock_class_by_index( + bt_trace_borrow_clock_class_by_index( ctf_fs_trace->metadata->trace, i); 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; @@ -1279,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"); + 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); BT_ASSERT(value_ret == BT_VALUE_STATUS_OK); - BT_PUT(value); - value = bt_value_map_get(params, "clock-class-offset-s"); + 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"); @@ -1296,10 +1330,9 @@ 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); BT_ASSERT(value_ret == BT_VALUE_STATUS_OK); - BT_PUT(value); } - 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"); @@ -1308,7 +1341,6 @@ 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); BT_ASSERT(value_ret == BT_VALUE_STATUS_OK); - BT_PUT(value); } ctf_fs->port_data = g_ptr_array_new_with_free_func(port_data_destroy); @@ -1335,7 +1367,6 @@ error: BT_ASSERT(ret == BT_COMPONENT_STATUS_OK); end: - bt_put(value); return ctf_fs; }