#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"
#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;
- BT_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->graph,
- 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;
}
}
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_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
+void set_msg_iter_emits_stream_beginning_end_messages(
+ struct ctf_fs_msg_iter_data *msg_iter_data)
{
- 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);
- int ret;
+ 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 **out_msg)
+{
+ bt_self_message_iterator_status status;
- BT_ASSERT(notif_iter_data->ds_file);
- next_ret = ctf_fs_ds_file_next(notif_iter_data->ds_file);
+ BT_ASSERT(msg_iter_data->ds_file);
- 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);
+ while (true) {
+ bt_message *msg;
+
+ 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;
- } else {
+ 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);
+
/*
- * First BT_NOTIFICATION_TYPE_STREAM_BEGIN
- * notification: skip all following.
+ * Open and start reading the next stream file
+ * within our stream file group.
*/
- notif_iter_data->skip_stream_begin_notifs = true;
+ 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;
+ }
+ default:
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++;
+end:
+ return status;
+}
- 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. 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_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)
+{
+ 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++;
}
+ }
- BT_PUT(next_ret.notification);
- bt_notif_iter_reset(notif_iter_data->notif_iter);
-
+ if (i > 0) {
/*
- * Open and start reading the next stream file within
- * our stream file group.
+ * 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.
*/
- ret = notif_iter_data_set_current_ds_file(notif_iter_data);
- if (ret) {
- next_ret.status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
- goto end;
- }
+ *count = i;
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+ }
- next_ret = ctf_fs_ds_file_next(notif_iter_data->ds_file);
+ return status;
+}
- /*
- * 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(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);
- }
+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 next_ret;
+ return ret;
}
-void ctf_fs_iterator_finalize(struct bt_private_connection_private_notification_iterator *it)
+BT_HIDDEN
+bt_self_message_iterator_status ctf_fs_iterator_seek_beginning(
+ bt_self_message_iterator *it)
{
- void *notif_iter_data =
- bt_private_connection_private_notification_iterator_get_user_data(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;
- ctf_fs_notif_iter_data_destroy(notif_iter_data);
+ BT_ASSERT(msg_iter_data);
+ if (ctf_fs_iterator_reset(msg_iter_data)) {
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+ }
+
+ return status;
}
-enum bt_notification_iterator_status ctf_fs_iterator_init(
- struct bt_private_connection_private_notification_iterator *it,
- struct bt_private_port *port)
+BT_HIDDEN
+void ctf_fs_iterator_finalize(bt_self_message_iterator *it)
{
- 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;
- int iret;
-
- port_data = bt_private_port_get_user_data(port);
- if (!port_data) {
- ret = BT_NOTIFICATION_ITERATOR_STATUS_INVALID;
- goto error;
- }
+ ctf_fs_msg_iter_data_destroy(
+ bt_self_message_iterator_get_data(it));
+}
- notif_iter_data = g_new0(struct ctf_fs_notif_iter_data, 1);
- if (!notif_iter_data) {
- ret = BT_NOTIFICATION_ITERATOR_STATUS_NOMEM;
+BT_HIDDEN
+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_msg_iter_data *msg_iter_data = NULL;
+ bt_self_message_iterator_status ret =
+ BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+
+ 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->graph = bt_component_borrow_graph(
- bt_component_borrow_from_private(port_data->ctf_fs->priv_comp));
- notif_iter_data->notif_iter = bt_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);
- if (iret) {
- ret = BT_NOTIFICATION_ITERATOR_STATUS_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;
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;
}
-static
+BT_HIDDEN
void ctf_fs_destroy(struct ctf_fs_component *ctf_fs)
{
if (!ctf_fs) {
g_free(ctf_fs);
}
-BT_HIDDEN
+static
+void port_data_destroy(struct ctf_fs_port_data *port_data)
+{
+ if (!port_data) {
+ return;
+ }
+
+ g_free(port_data);
+}
+
+static
+void port_data_destroy_notifier(void *data) {
+ port_data_destroy(data);
+}
+
+static
void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace)
{
if (!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);
}
g_free(ctf_fs_trace->metadata);
}
- bt_put(ctf_fs_trace->cc_prio_map);
g_free(ctf_fs_trace);
}
ctf_fs_trace_destroy(trace);
}
-void ctf_fs_finalize(struct bt_private_component *component)
+struct ctf_fs_component *ctf_fs_component_create(void)
{
- void *data = bt_private_component_get_user_data(component);
+ struct ctf_fs_component *ctf_fs;
- ctf_fs_destroy(data);
-}
+ ctf_fs = g_new0(struct ctf_fs_component, 1);
+ if (!ctf_fs) {
+ goto error;
+ }
-static
-void port_data_destroy(void *data) {
- struct ctf_fs_port_data *port_data = data;
+ ctf_fs->port_data =
+ g_ptr_array_new_with_free_func(port_data_destroy_notifier);
+ if (!ctf_fs->port_data) {
+ goto error;
+ }
- if (!port_data) {
- return;
+ ctf_fs->traces =
+ g_ptr_array_new_with_free_func(ctf_fs_trace_destroy_notifier);
+ if (!ctf_fs->traces) {
+ goto error;
}
- g_free(port_data);
+ goto end;
+
+error:
+ if (ctf_fs) {
+ ctf_fs_destroy(ctf_fs);
+ }
+
+end:
+ return ctf_fs;
+}
+
+void ctf_fs_finalize(bt_self_component_source *component)
+{
+ ctf_fs_destroy(bt_self_component_get_data(
+ bt_self_component_source_as_self_component(component)));
}
static
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;
}
return ret;
}
-static
-uint64_t get_packet_header_stream_instance_id(struct ctf_fs_trace *ctf_fs_trace,
- struct bt_field *packet_header_field)
-{
- struct bt_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_field_structure_borrow_field_by_name(
- packet_header_field, "stream_instance_id");
- if (!stream_instance_id_field) {
- goto end;
- }
-
- ret = bt_field_integer_unsigned_get_value(stream_instance_id_field,
- &stream_instance_id);
- if (ret) {
- stream_instance_id = -1ULL;
- goto end;
- }
-
-end:
- return stream_instance_id;
-}
-
-uint64_t get_packet_context_timestamp_begin_ns(
- struct ctf_fs_trace *ctf_fs_trace,
- struct bt_field *packet_context_field)
-{
- int ret;
- 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_clock_class *timestamp_begin_clock_class = NULL;
-
- if (!packet_context_field) {
- goto end;
- }
-
- 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_borrow_type(timestamp_begin_field);
- BT_ASSERT(timestamp_begin_ft);
- timestamp_begin_clock_class =
- bt_field_type_integer_borrow_mapped_clock_class(timestamp_begin_ft);
- if (!timestamp_begin_clock_class) {
- goto end;
- }
-
- ret = bt_field_integer_unsigned_get_value(timestamp_begin_field,
- ×tamp_begin_raw_value);
- if (ret) {
- goto end;
- }
-
- ret = bt_clock_class_cycles_to_ns(timestamp_begin_clock_class,
- timestamp_begin_raw_value, ×tamp_begin_ns_signed);
- if (ret) {
- goto end;
- }
-
- timestamp_begin_ns = (uint64_t) timestamp_begin_ns_signed;
-
-end:
- return timestamp_begin_ns;
-}
-
static
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;
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);
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_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 = bt_get(stream_class);
+ BT_ASSERT(sc);
+ ds_file_group->sc = sc;
ds_file_group->ctf_fs_trace = ctf_fs_trace;
goto end;
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;
static
int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
- struct bt_graph *graph, const char *path)
+ const char *path)
{
- 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;
+ 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_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_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, graph, notif_iter,
+ 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_borrow_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_borrow_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_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);
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
* 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;
}
goto end;
}
- BT_ASSERT(stream_instance_id != -1ULL);
- BT_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++) {
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;
}
ctf_fs_ds_file_destroy(ds_file);
- if (notif_iter) {
- bt_notif_iter_destroy(notif_iter);
+ if (msg_iter) {
+ bt_msg_iter_destroy(msg_iter);
}
ctf_fs_ds_index_destroy(index);
}
static
-int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace,
- struct bt_graph *graph)
+int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace)
{
int ret = 0;
const char *basename;
GError *error = NULL;
GDir *dir = NULL;
- size_t i;
/* Check each file in the path directory, except specific ones */
dir = g_dir_open(ctf_fs_trace->path->str, 0, &error);
continue;
}
- ret = add_ds_file_to_ds_file_group(ctf_fs_trace, graph,
+ 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",
ctf_fs_file_destroy(file);
}
- /*
- * At this point, DS file groupes are created, but their
- * associated stream objects do not exist yet. This is because
- * we need to name the created stream object with the data
- * stream file's path. We have everything we need here to do
- * this.
- */
- for (i = 0; i < ctf_fs_trace->ds_file_groups->len; i++) {
- struct ctf_fs_ds_file_group *ds_file_group =
- g_ptr_array_index(ctf_fs_trace->ds_file_groups, i);
- GString *name = get_stream_instance_unique_name(ds_file_group);
-
- if (!name) {
- goto error;
- }
-
- if (ds_file_group->stream_id == -1ULL) {
- /* 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_stream_create(
- ds_file_group->stream_class, name->str,
- 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);
- goto error;
- }
- }
-
goto end;
error:
}
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;
- BT_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_trace_get_clock_class_count(
- ctf_fs_trace->metadata->trace);
- BT_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_clock_class *clock_class =
- bt_trace_borrow_clock_class_by_index(
- ctf_fs_trace->metadata->trace, i);
+ if (name_suffix) {
+ g_string_append_c(name, G_DIR_SEPARATOR);
+ }
+ }
- BT_ASSERT(clock_class);
- ret = bt_clock_class_priority_map_add_clock_class(
- ctf_fs_trace->cc_prio_map, clock_class, 0);
+ 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_metadata_config *metadata_config,
- struct bt_graph *graph)
+static
+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;
int ret;
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, graph);
- 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;
+ }
+ }
+
+ if (ctf_fs_trace->trace) {
+ ret = set_trace_name(ctf_fs_trace->trace, name);
+ if (ret) {
+ goto error;
+ }
}
- ret = create_cc_prio_map(ctf_fs_trace);
+ ret = create_ds_file_groups(ctf_fs_trace);
if (ret) {
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.
- */
- (void) bt_trace_set_is_static(ctf_fs_trace->metadata->trace);
-
goto end;
error:
ctf_fs_trace_destroy(ctf_fs_trace);
ctf_fs_trace = NULL;
+
end:
return ctf_fs_trace;
}
return ret;
}
-BT_HIDDEN
+static
int ctf_fs_find_traces(GList **trace_paths, const char *start_path)
{
int ret;
return ret;
}
-BT_HIDDEN
+static
GList *ctf_fs_create_trace_names(GList *trace_paths, const char *base_path) {
GList *trace_names = NULL;
GList *node;
return trace_names;
}
+/* Helper for ctf_fs_component_create_ctf_fs_traces, to handle a single path/root. */
+
static
-int create_ctf_fs_traces(struct ctf_fs_component *ctf_fs,
+int ctf_fs_component_create_ctf_fs_traces_one_root(bt_self_component_source *self_comp,
+ struct ctf_fs_component *ctf_fs,
const char *path_param)
{
struct ctf_fs_trace *ctf_fs_trace = NULL;
tn_node = g_list_next(tn_node)) {
GString *trace_path = tp_node->data;
GString *trace_name = tn_node->data;
- struct bt_graph *graph = bt_component_borrow_graph(
- bt_component_borrow_from_private(ctf_fs->priv_comp));
- BT_ASSERT(graph);
- ctf_fs_trace = ctf_fs_trace_create(trace_path->str,
- trace_name->str, &ctf_fs->metadata_config,
- graph);
+ 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);
goto error;
}
- ret = create_ports_for_trace(ctf_fs, ctf_fs_trace);
- if (ret) {
- goto error;
- }
-
g_ptr_array_add(ctf_fs->traces, ctf_fs_trace);
ctf_fs_trace = NULL;
}
return ret;
}
+int ctf_fs_component_create_ctf_fs_traces(bt_self_component_source *self_comp,
+ struct ctf_fs_component *ctf_fs,
+ const bt_value *paths_value)
+{
+ int ret = 0;
+ uint64_t i;
+
+ 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);
+
+ ret = ctf_fs_component_create_ctf_fs_traces_one_root(self_comp, ctf_fs, path);
+ if (ret) {
+ goto end;
+ }
+ }
+
+end:
+ return ret;
+}
+
+/* Create the IR stream objects for ctf_fs_trace. */
+
static
-struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp,
- struct bt_value *params)
+int create_streams_for_trace(struct ctf_fs_trace *ctf_fs_trace)
{
- struct ctf_fs_component *ctf_fs;
- struct bt_value *value = NULL;
- const char *path_param;
- enum bt_component_status ret;
- enum bt_value_status value_ret;
+ int ret;
+ GString *name = NULL;
+ guint i;
- ctf_fs = g_new0(struct ctf_fs_component, 1);
+ for (i = 0; i < ctf_fs_trace->ds_file_groups->len; i++) {
+ struct ctf_fs_ds_file_group *ds_file_group =
+ g_ptr_array_index(ctf_fs_trace->ds_file_groups, i);
+ name = get_stream_instance_unique_name(ds_file_group);
+
+ if (!name) {
+ goto error;
+ }
+
+ 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 {
+ ds_file_group->stream = NULL;
+ }
+
+ if (!ds_file_group->stream) {
+ BT_LOGE("Cannot create stream for DS file group: "
+ "addr=%p, stream-name=\"%s\"",
+ ds_file_group, name->str);
+ 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);
+ goto error;
+ }
+
+ g_string_free(name, TRUE);
+ name = NULL;
+ }
+
+ ret = 0;
+ goto end;
+
+error:
+ ret = -1;
+
+end:
+
+ if (name) {
+ g_string_free(name, TRUE);
+ }
+ return ret;
+}
+
+bool validate_paths_parameter(const bt_value *paths)
+{
+ bool ret;
+ bt_value_type type;
+ uint64_t i;
+
+ if (!paths) {
+ BT_LOGE("missing \"paths\" parameter");
+ goto error;
+ }
+
+ type = bt_value_get_type(paths);
+ if (type != BT_VALUE_TYPE_ARRAY) {
+ BT_LOGE("`paths` 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++) {
+ const bt_value *elem;
+
+ elem = bt_value_array_borrow_element_by_index_const(paths, i);
+ type = bt_value_get_type(elem);
+ if (type != BT_VALUE_TYPE_STRING) {
+ BT_LOGE("`paths` parameter: expecting string value: index=%" PRIu64 ", type=%s",
+ i, bt_common_value_type_string(type));
+ goto error;
+ }
+ }
+
+ ret = true;
+ goto end;
+
+error:
+ ret = false;
+
+end:
+ return ret;
+}
+
+static
+struct ctf_fs_component *ctf_fs_create(
+ bt_self_component_source *self_comp,
+ const bt_value *params)
+{
+ struct ctf_fs_component *ctf_fs = NULL;
+ const bt_value *value = NULL;
+ guint i;
+ const bt_value *paths_value;
+
+ paths_value = bt_value_map_borrow_entry_value_const(params, "paths");
+ if (!validate_paths_parameter(paths_value)) {
+ goto error;
+ }
+
+ ctf_fs = ctf_fs_component_create();
if (!ctf_fs) {
- goto end;
+ goto error;
}
- ret = bt_private_component_set_user_data(priv_comp, ctf_fs);
- BT_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_borrow(params, "path");
- if (value && !bt_value_is_string(value)) {
- goto error;
- }
+ ctf_fs->self_comp = self_comp;
- value_ret = bt_value_string_get(value, &path_param);
- BT_ASSERT(value_ret == BT_VALUE_STATUS_OK);
- value = bt_value_map_borrow(params, "clock-class-offset-s");
+ 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);
- BT_ASSERT(value_ret == BT_VALUE_STATUS_OK);
+ ctf_fs->metadata_config.clock_class_offset_s = bt_value_integer_get(value);
}
- value = bt_value_map_borrow(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);
- BT_ASSERT(value_ret == BT_VALUE_STATUS_OK);
+ 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);
- if (!ctf_fs->port_data) {
+ if (ctf_fs_component_create_ctf_fs_traces(self_comp, ctf_fs, paths_value)) {
goto error;
}
- ctf_fs->traces = g_ptr_array_new_with_free_func(
- ctf_fs_trace_destroy_notifier);
- if (!ctf_fs->traces) {
- goto error;
- }
+ for (i = 0; i < ctf_fs->traces->len; i++) {
+ struct ctf_fs_trace *trace = g_ptr_array_index(ctf_fs->traces, i);
- if (create_ctf_fs_traces(ctf_fs, path_param)) {
- goto error;
+ if (create_streams_for_trace(trace)) {
+ goto error;
+ }
+
+ if (create_ports_for_trace(ctf_fs, trace)) {
+ goto error;
+ }
}
goto end;
error:
ctf_fs_destroy(ctf_fs);
ctf_fs = NULL;
- ret = bt_private_component_set_user_data(priv_comp, NULL);
- BT_ASSERT(ret == BT_COMPONENT_STATUS_OK);
+ bt_self_component_set_data(
+ bt_self_component_source_as_self_component(self_comp),
+ NULL);
end:
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;
}
projects / deliverable / babeltrace.git / blobdiff