X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Ffs.c;h=3cee435af0f9a9b74f54fe65ca5e2804b18a3746;hb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;hp=7d2fb08be147c3a0f35beb95b995f8d1418890d1;hpb=fdd3a2da18afef5ca32ba181a8b6ebbff173df02;p=babeltrace.git diff --git a/plugins/ctf/fs-src/fs.c b/plugins/ctf/fs-src/fs.c index 7d2fb08b..3cee435a 100644 --- a/plugins/ctf/fs-src/fs.c +++ b/plugins/ctf/fs-src/fs.c @@ -25,12 +25,12 @@ * SOFTWARE. */ -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include #include #include "fs.h" @@ -399,29 +399,48 @@ void ctf_fs_finalize(bt_self_component_source *component) 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 @@ -431,14 +450,14 @@ int create_one_port_for_trace(struct ctf_fs_component *ctf_fs, { 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); @@ -449,7 +468,7 @@ int create_one_port_for_trace(struct ctf_fs_component *ctf_fs, 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; } @@ -463,7 +482,7 @@ error: end: if (port_name) { - g_string_free(port_name, TRUE); + g_free(port_name); } port_data_destroy(port_data); @@ -505,13 +524,12 @@ void ctf_fs_ds_file_info_destroy(struct ctf_fs_ds_file_info *ds_file_info) g_string_free(ds_file_info->path, TRUE); } - ctf_fs_ds_index_destroy(ds_file_info->index); g_free(ds_file_info); } static struct ctf_fs_ds_file_info *ctf_fs_ds_file_info_create(const char *path, - int64_t begin_ns, struct ctf_fs_ds_index *index) + int64_t begin_ns) { struct ctf_fs_ds_file_info *ds_file_info; @@ -528,11 +546,8 @@ struct ctf_fs_ds_file_info *ctf_fs_ds_file_info_create(const char *path, } ds_file_info->begin_ns = begin_ns; - ds_file_info->index = index; - index = NULL; end: - ctf_fs_ds_index_destroy(index); return ds_file_info; } @@ -547,6 +562,13 @@ 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); } + if (ds_file_group->index) { + if (ds_file_group->index->entries) { + g_ptr_array_free(ds_file_group->index->entries, TRUE); + } + g_free(ds_file_group->index); + } + bt_stream_put_ref(ds_file_group->stream); g_free(ds_file_group); } @@ -555,7 +577,8 @@ static struct ctf_fs_ds_file_group *ctf_fs_ds_file_group_create( struct ctf_fs_trace *ctf_fs_trace, struct ctf_stream_class *sc, - uint64_t stream_instance_id) + uint64_t stream_instance_id, + struct ctf_fs_ds_index *index) { struct ctf_fs_ds_file_group *ds_file_group; @@ -570,6 +593,8 @@ struct ctf_fs_ds_file_group *ctf_fs_ds_file_group_create( goto error; } + ds_file_group->index = index; + ds_file_group->stream_id = stream_instance_id; BT_ASSERT(sc); ds_file_group->sc = sc; @@ -578,6 +603,7 @@ struct ctf_fs_ds_file_group *ctf_fs_ds_file_group_create( error: ctf_fs_ds_file_group_destroy(ds_file_group); + ctf_fs_ds_index_destroy(index); ds_file_group = NULL; end: @@ -600,7 +626,7 @@ void array_insert(GPtrArray *array, gpointer element, size_t pos) (original_array_len - pos) * sizeof(gpointer)); } - /* Insert the value and bump the array len */ + /* Insert the value. */ array->pdata[pos] = element; } @@ -629,6 +655,26 @@ void ds_file_group_insert_ds_file_info_sorted( array_insert(ds_file_group->ds_file_infos, ds_file_info, i); } +static +void ds_file_group_insert_ds_index_entry_sorted( + struct ctf_fs_ds_file_group *ds_file_group, + struct ctf_fs_ds_index_entry *entry) +{ + guint i; + + /* Find the spot where to insert this index entry. */ + for (i = 0; i < ds_file_group->index->entries->len; i++) { + struct ctf_fs_ds_index_entry *other_entry = g_ptr_array_index( + ds_file_group->index->entries, i); + + if (entry->timestamp_begin_ns < other_entry->timestamp_begin_ns) { + break; + } + } + + array_insert(ds_file_group->index->entries, entry, i); +} + /* * Create a new ds_file_info using the provided path, begin_ns and index, then * add it to ds_file_group's list of ds_file_infos. @@ -637,15 +683,12 @@ void ds_file_group_insert_ds_file_info_sorted( static int ctf_fs_ds_file_group_add_ds_file_info( struct ctf_fs_ds_file_group *ds_file_group, - const char *path, int64_t begin_ns, - struct ctf_fs_ds_index *index) + const char *path, int64_t begin_ns) { struct ctf_fs_ds_file_info *ds_file_info; int ret = 0; - /* Onwership of index is transferred. */ - ds_file_info = ctf_fs_ds_file_info_create(path, begin_ns, index); - index = NULL; + ds_file_info = ctf_fs_ds_file_info_create(path, begin_ns); if (!ds_file_info) { goto error; } @@ -657,7 +700,6 @@ int ctf_fs_ds_file_group_add_ds_file_info( error: ctf_fs_ds_file_info_destroy(ds_file_info); - ctf_fs_ds_index_destroy(index); ret = -1; end: return ret; @@ -742,15 +784,16 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, * group. */ ds_file_group = ctf_fs_ds_file_group_create(ctf_fs_trace, - sc, UINT64_C(-1)); + sc, UINT64_C(-1), index); + /* Ownership of index is transferred. */ + index = NULL; + if (!ds_file_group) { goto error; } ret = ctf_fs_ds_file_group_add_ds_file_info(ds_file_group, - path, begin_ns, index); - /* Ownership of index is transferred. */ - index = NULL; + path, begin_ns); if (ret) { goto error; } @@ -778,7 +821,9 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, if (!ds_file_group) { ds_file_group = ctf_fs_ds_file_group_create(ctf_fs_trace, - sc, stream_instance_id); + sc, stream_instance_id, index); + /* Ownership of index is transferred. */ + index = NULL; if (!ds_file_group) { goto error; } @@ -787,8 +832,7 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, } ret = ctf_fs_ds_file_group_add_ds_file_info(ds_file_group, path, - begin_ns, index); - index = NULL; + begin_ns); if (ret) { goto error; } @@ -797,6 +841,7 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, error: ctf_fs_ds_file_group_destroy(ds_file_group); + ds_file_group = NULL; ret = -1; end: @@ -1367,12 +1412,25 @@ void merge_ctf_fs_ds_file_groups(struct ctf_fs_ds_file_group *dest, struct ctf_f ds_file_group_insert_ds_file_info_sorted(dest, ds_file_info); } -} + /* Merge both indexes. */ + for (i = 0; i < src->index->entries->len; i++) { + struct ctf_fs_ds_index_entry *entry = g_ptr_array_index( + src->index->entries, i); + + /* + * Ownership of the ctf_fs_ds_index_entry is transferred to + * dest. + */ + g_ptr_array_index(src->index->entries, i) = NULL; + + ds_file_group_insert_ds_index_entry_sorted(dest, entry); + } +} /* 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) { @@ -1380,6 +1438,7 @@ void merge_matching_ctf_fs_ds_file_groups( 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 @@ -1422,17 +1481,32 @@ void merge_matching_ctf_fs_ds_file_groups( /* * Didn't find a friend in dest to merge our src_group into? - * Create a new empty one. + * Create a new empty one. This can happen if a stream was + * active in the source trace chunk but not in the destination + * trace chunk. */ if (!dest_group) { struct ctf_stream_class *sc; + struct ctf_fs_ds_index *index; sc = ctf_trace_class_borrow_stream_class_by_id( dest_trace->metadata->tc, src_group->sc->id); BT_ASSERT(sc); + index = ctf_fs_ds_index_create(); + if (!index) { + ret = -1; + goto end; + } + dest_group = ctf_fs_ds_file_group_create(dest_trace, sc, - src_group->stream_id); + src_group->stream_id, index); + /* Ownership of index is transferred. */ + index = NULL; + if (!dest_group) { + ret = -1; + goto end; + } g_ptr_array_add(dest_trace->ds_file_groups, dest_group); } @@ -1440,6 +1514,9 @@ void merge_matching_ctf_fs_ds_file_groups( BT_ASSERT(dest_group); merge_ctf_fs_ds_file_groups(dest_group, src_group); } + +end: + return ret; } /* @@ -1453,11 +1530,12 @@ void merge_matching_ctf_fs_ds_file_groups( */ 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); @@ -1493,7 +1571,10 @@ void merge_ctf_fs_traces(struct ctf_fs_trace **traces, unsigned int num_traces) } /* 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); @@ -1503,6 +1584,9 @@ void merge_ctf_fs_traces(struct ctf_fs_trace **traces, unsigned int num_traces) /* 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; } /* @@ -1511,12 +1595,13 @@ void merge_ctf_fs_traces(struct ctf_fs_trace **traces, unsigned int num_traces) */ 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); @@ -1544,7 +1629,10 @@ void merge_traces_with_same_uuid(struct ctf_fs_component *ctf_fs) 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++; @@ -1561,6 +1649,9 @@ void merge_traces_with_same_uuid(struct ctf_fs_component *ctf_fs) } BT_ASSERT(num_traces == traces->len); + +end: + return ret; } int ctf_fs_component_create_ctf_fs_traces(bt_self_component_source *self_comp, @@ -1580,12 +1671,37 @@ 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