bt_self_component_source_as_self_component(component)));
}
-static
-GString *get_stream_instance_unique_name(
- struct ctf_fs_ds_file_group *ds_file_group)
+gchar *ctf_fs_make_port_name(struct ctf_fs_ds_file_group *ds_file_group)
{
- GString *name;
- struct ctf_fs_ds_file_info *ds_file_info;
+ GString *name = g_string_new(NULL);
- name = g_string_new(NULL);
- if (!name) {
- goto end;
+ /*
+ * The unique port name is generated by concatenating unique identifiers
+ * for:
+ *
+ * - the trace
+ * - the stream class
+ * - the stream
+ */
+
+ /* For the trace, use the uuid if present, else the path. */
+ if (ds_file_group->ctf_fs_trace->metadata->tc->is_uuid_set) {
+ char uuid_str[BABELTRACE_UUID_STR_LEN];
+
+ bt_uuid_unparse(ds_file_group->ctf_fs_trace->metadata->tc->uuid, uuid_str);
+ g_string_assign(name, uuid_str);
+ } else {
+ g_string_assign(name, ds_file_group->ctf_fs_trace->path->str);
}
/*
- * If there's more than one stream file in the stream file
- * group, the first (earliest) stream file's path is used as
- * the stream's unique name.
+ * For the stream class, use the id if present. We can omit this field
+ * otherwise, as there will only be a single stream class.
*/
- 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);
+ if (ds_file_group->sc->id != UINT64_C(-1)) {
+ g_string_append_printf(name, " | %" PRIu64, ds_file_group->sc->id);
+ }
-end:
- return name;
+ /* For the stream, use the id if present, else, use the path. */
+ if (ds_file_group->stream_id != UINT64_C(-1)) {
+ g_string_append_printf(name, " | %" PRIu64, ds_file_group->stream_id);
+ } else {
+ BT_ASSERT(ds_file_group->ds_file_infos->len == 1);
+ struct ctf_fs_ds_file_info *ds_file_info =
+ g_ptr_array_index(ds_file_group->ds_file_infos, 0);
+ g_string_append_printf(name, " | %s", ds_file_info->path->str);
+ }
+
+ return g_string_free(name, FALSE);
}
static
{
int ret = 0;
struct ctf_fs_port_data *port_data = NULL;
- GString *port_name = NULL;
+ gchar *port_name;
- port_name = get_stream_instance_unique_name(ds_file_group);
+ port_name = ctf_fs_make_port_name(ds_file_group);
if (!port_name) {
goto error;
}
- BT_LOGD("Creating one port named `%s`", port_name->str);
+ BT_LOGD("Creating one port named `%s`", port_name);
/* Create output port for this file */
port_data = g_new0(struct ctf_fs_port_data, 1);
port_data->ctf_fs = ctf_fs;
port_data->ds_file_group = ds_file_group;
ret = bt_self_component_source_add_output_port(
- ctf_fs->self_comp, port_name->str, port_data, NULL);
+ ctf_fs->self_comp, port_name, port_data, NULL);
if (ret) {
goto error;
}
end:
if (port_name) {
- g_string_free(port_name, TRUE);
+ g_free(port_name);
}
port_data_destroy(port_data);
error:
ctf_fs_ds_file_group_destroy(ds_file_group);
+ ds_file_group = NULL;
ret = -1;
end:
/* Merge src_trace's data stream file groups into dest_trace's. */
static
-void merge_matching_ctf_fs_ds_file_groups(
+int merge_matching_ctf_fs_ds_file_groups(
struct ctf_fs_trace *dest_trace,
struct ctf_fs_trace *src_trace)
{
GPtrArray *dest = dest_trace->ds_file_groups;
GPtrArray *src = src_trace->ds_file_groups;
guint s_i;
+ int ret = 0;
/*
* Save the initial length of dest: we only want to check against the
dest_group = ctf_fs_ds_file_group_create(dest_trace, sc,
src_group->stream_id);
+ if (!dest_group) {
+ ret = -1;
+ goto end;
+ }
g_ptr_array_add(dest_trace->ds_file_groups, dest_group);
}
BT_ASSERT(dest_group);
merge_ctf_fs_ds_file_groups(dest_group, src_group);
}
+
+end:
+ return ret;
}
/*
*/
static
-void merge_ctf_fs_traces(struct ctf_fs_trace **traces, unsigned int num_traces)
+int merge_ctf_fs_traces(struct ctf_fs_trace **traces, unsigned int num_traces)
{
unsigned int winner_count;
struct ctf_fs_trace *winner;
guint i;
+ int ret = 0;
char uuid_str[BABELTRACE_UUID_STR_LEN];
BT_ASSERT(num_traces >= 2);
}
/* Merge trace's data stream file groups into winner's. */
- merge_matching_ctf_fs_ds_file_groups(winner, trace);
+ ret = merge_matching_ctf_fs_ds_file_groups(winner, trace);
+ if (ret) {
+ goto end;
+ }
/* Free the trace that got merged into winner, clear the slot in the array. */
ctf_fs_trace_destroy(trace);
/* Use the string representation of the UUID as the trace name. */
bt_uuid_unparse(winner->metadata->tc->uuid, uuid_str);
g_string_printf(winner->name, "%s", uuid_str);
+
+end:
+ return ret;
}
/*
*/
static
-void merge_traces_with_same_uuid(struct ctf_fs_component *ctf_fs)
+int merge_traces_with_same_uuid(struct ctf_fs_component *ctf_fs)
{
GPtrArray *traces = ctf_fs->traces;
guint range_start_idx = 0;
unsigned int num_traces = 0;
guint i;
+ int ret = 0;
/* Sort the traces by uuid, then collapse traces with the same uuid in a single one. */
g_ptr_array_sort(traces, sort_traces_by_uuid);
range_len = range_end_exc_idx - range_start_idx;
if (range_len > 1) {
struct ctf_fs_trace **range_start = (struct ctf_fs_trace **) &traces->pdata[range_start_idx];
- merge_ctf_fs_traces(range_start, range_len);
+ ret = merge_ctf_fs_traces(range_start, range_len);
+ if (ret) {
+ goto end;
+ }
}
num_traces++;
}
BT_ASSERT(num_traces == traces->len);
+
+end:
+ return ret;
}
int ctf_fs_component_create_ctf_fs_traces(bt_self_component_source *self_comp,
}
}
- merge_traces_with_same_uuid(ctf_fs);
+ ret = merge_traces_with_same_uuid(ctf_fs);
end:
return ret;
}
+static
+GString *get_stream_instance_unique_name(
+ struct ctf_fs_ds_file_group *ds_file_group)
+{
+ GString *name;
+ struct ctf_fs_ds_file_info *ds_file_info;
+
+ name = g_string_new(NULL);
+ if (!name) {
+ goto end;
+ }
+
+ /*
+ * If there's more than one stream file in the stream file
+ * group, the first (earliest) stream file's path is used as
+ * the stream's unique name.
+ */
+ 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);
+
+end:
+ return name;
+}
+
/* Create the IR stream objects for ctf_fs_trace. */
static