g_free(msg_iter_data);
}
+static
+void set_msg_iter_emits_stream_beginning_end_messages(
+ struct ctf_fs_msg_iter_data *msg_iter_data)
+{
+ bt_msg_iter_set_emit_stream_beginning_message(
+ msg_iter_data->ds_file->msg_iter,
+ msg_iter_data->ds_file_info_index == 0);
+ bt_msg_iter_set_emit_stream_end_message(
+ msg_iter_data->ds_file->msg_iter,
+ msg_iter_data->ds_file_info_index ==
+ msg_iter_data->ds_file_group->ds_file_infos->len - 1);
+}
+
static
bt_self_message_iterator_status ctf_fs_iterator_next_one(
struct ctf_fs_msg_iter_data *msg_iter_data,
- const bt_message **msg)
+ const bt_message **out_msg)
{
bt_self_message_iterator_status status;
- bt_message *priv_msg;
- int ret;
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;
- }
- }
+ while (true) {
+ bt_message *msg;
- 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++;
+ status = ctf_fs_ds_file_next(msg_iter_data->ds_file, &msg);
+ switch (status) {
+ case BT_SELF_MESSAGE_ITERATOR_STATUS_OK:
+ *out_msg = msg;
+ msg = NULL;
+ goto end;
+ case BT_SELF_MESSAGE_ITERATOR_STATUS_END:
+ {
+ int ret;
+
+ if (msg_iter_data->ds_file_info_index ==
+ msg_iter_data->ds_file_group->ds_file_infos->len - 1) {
+ /* End of all group's stream files */
+ goto end;
+ }
+
+ msg_iter_data->ds_file_info_index++;
+ bt_msg_iter_reset_for_next_stream_file(
+ msg_iter_data->msg_iter);
+ set_msg_iter_emits_stream_beginning_end_messages(
+ msg_iter_data);
- 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. 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().
+ * Open and start reading the next stream file
+ * within our stream file group.
*/
- goto end;
- }
+ ret = msg_iter_data_set_current_ds_file(msg_iter_data);
+ if (ret) {
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+ 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 = msg_iter_data_set_current_ds_file(msg_iter_data);
- if (ret) {
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
- goto end;
+ /* Continue the loop to get the next message */
+ break;
}
-
- status = ctf_fs_ds_file_next(msg_iter_data->ds_file, &priv_msg);
- *msg = priv_msg;
-
- /*
- * 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.
- */
- 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);
+ default:
+ goto end;
}
}
return status;
}
+static
+int ctf_fs_iterator_reset(struct ctf_fs_msg_iter_data *msg_iter_data)
+{
+ int ret;
+
+ msg_iter_data->ds_file_info_index = 0;
+ ret = msg_iter_data_set_current_ds_file(msg_iter_data);
+ if (ret) {
+ goto end;
+ }
+
+ bt_msg_iter_reset(msg_iter_data->msg_iter);
+ set_msg_iter_emits_stream_beginning_end_messages(msg_iter_data);
+
+end:
+ return ret;
+}
+
+BT_HIDDEN
+bt_self_message_iterator_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_ASSERT(msg_iter_data);
+ if (ctf_fs_iterator_reset(msg_iter_data)) {
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+ }
+
+ return status;
+}
+
+BT_HIDDEN
void ctf_fs_iterator_finalize(bt_self_message_iterator *it)
{
ctf_fs_msg_iter_data_destroy(
bt_self_message_iterator_get_data(it));
}
+BT_HIDDEN
bt_self_message_iterator_status ctf_fs_iterator_init(
bt_self_message_iterator *self_msg_iter,
bt_self_component_source *self_comp,
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_self_component_port_get_data(
bt_self_component_port_output_as_self_component_port(
}
msg_iter_data->ds_file_group = port_data->ds_file_group;
- iret = msg_iter_data_set_current_ds_file(msg_iter_data);
- if (iret) {
+ if (ctf_fs_iterator_reset(msg_iter_data)) {
ret = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
goto error;
}
}
static
-void ctf_fs_trace_destroy_msgier(void *data)
+void ctf_fs_trace_destroy_notifier(void *data)
{
struct ctf_fs_trace *trace = data;
ctf_fs_trace_destroy(trace);
}
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,
- bt_stream_class *stream_class,
+ struct ctf_stream_class *sc,
uint64_t stream_instance_id)
{
struct ctf_fs_ds_file_group *ds_file_group;
}
ds_file_group->stream_id = stream_instance_id;
- BT_ASSERT(stream_class);
- ds_file_group->stream_class = stream_class;
- bt_stream_class_get_ref(ds_file_group->stream_class);
+ BT_ASSERT(sc);
+ ds_file_group->sc = sc;
ds_file_group->ctf_fs_trace = ctf_fs_trace;
goto end;
int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
const char *path)
{
- 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;
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_clock_class_cycles_to_ns_from_origin(
- sc->default_clock_class,
- props.snapshots.beginning_clock, &begin_ns);
+ 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);
* group.
*/
ds_file_group = ctf_fs_ds_file_group_create(ctf_fs_trace,
- stream_class, stream_instance_id);
+ sc, UINT64_C(-1));
if (!ds_file_group) {
goto error;
}
ds_file_group = g_ptr_array_index(
ctf_fs_trace->ds_file_groups, i);
- if (ds_file_group->stream_class == stream_class &&
+ if (ds_file_group->sc == sc &&
ds_file_group->stream_id ==
stream_instance_id) {
break;
if (!ds_file_group) {
ds_file_group = ctf_fs_ds_file_group_create(ctf_fs_trace,
- stream_class, stream_instance_id);
+ sc, stream_instance_id);
if (!ds_file_group) {
goto error;
}
goto error;
}
- 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++;
+ if (ds_file_group->sc->ir_sc) {
+ BT_ASSERT(ctf_fs_trace->trace);
+
+ 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->sc->ir_sc,
+ 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_stream_create_with_id(
+ ds_file_group->sc->ir_sc,
+ ctf_fs_trace->trace,
+ (uint64_t) ds_file_group->stream_id);
+ }
} else {
- /* Specific 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);
+ ds_file_group->stream = NULL;
}
if (!ds_file_group->stream) {
goto error;
}
- /*
- * create_ds_file_groups() created all the streams that this
- * trace needs. There won't be any more. Therefore it is safe to
- * make this trace static.
- */
- if (ctf_fs_trace->trace) {
- (void) bt_trace_make_static(ctf_fs_trace->trace);
- }
-
goto end;
error:
}
ctf_fs->traces = g_ptr_array_new_with_free_func(
- ctf_fs_trace_destroy_msgier);
+ ctf_fs_trace_destroy_notifier);
if (!ctf_fs->traces) {
goto error;
}
projects / babeltrace.git / blobdiff