X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fquery.c;h=d632d42d51d76c199b0db561580c2c94b0ce6d3b;hb=c80d4c65ee2320f014281e979bb732ad1bf14ce9;hp=04bf8c5b0e301996d353e2965578d4cba020addd;hpb=839d52a5c5c1fdd66cee9bf7d06c0c0acdd4c2a3;p=babeltrace.git diff --git a/plugins/ctf/fs-src/query.c b/plugins/ctf/fs-src/query.c index 04bf8c5b..d632d42d 100644 --- a/plugins/ctf/fs-src/query.c +++ b/plugins/ctf/fs-src/query.c @@ -26,7 +26,7 @@ #include "query.h" #include -#include +#include #include "metadata.h" #include "../common/metadata/decoder.h" #include @@ -46,16 +46,14 @@ struct range { }; BT_HIDDEN -struct bt_component_class_query_method_return metadata_info_query( - struct bt_component_class *comp_class, - struct bt_value *params) +bt_query_status metadata_info_query( + bt_self_component_class_source *comp_class, + const bt_value *params, + const bt_value **user_result) { - struct bt_component_class_query_method_return query_ret = { - .result = NULL, - .status = BT_QUERY_STATUS_OK, - }; - - struct bt_value *path_value = NULL; + bt_query_status status = BT_QUERY_STATUS_OK; + bt_value *result = NULL; + const bt_value *path_value = NULL; char *metadata_text = NULL; FILE *metadata_fp = NULL; GString *g_metadata_text = NULL; @@ -64,27 +62,36 @@ struct bt_component_class_query_method_return metadata_info_query( const char *path; bool is_packetized; - query_ret.result = bt_value_map_create(); - if (!query_ret.result) { - query_ret.status = BT_QUERY_STATUS_NOMEM; + result = bt_value_map_create(); + if (!result) { + status = BT_QUERY_STATUS_NOMEM; goto error; } + BT_ASSERT(params); + if (!bt_value_is_map(params)) { BT_LOGE_STR("Query parameters is not a map value object."); - query_ret.status = BT_QUERY_STATUS_INVALID_PARAMS; + status = BT_QUERY_STATUS_INVALID_PARAMS; goto error; } - path_value = bt_value_map_get(params, "path"); - ret = bt_value_string_get(path_value, &path); - if (ret) { - BT_LOGE_STR("Cannot get `path` string parameter."); - query_ret.status = BT_QUERY_STATUS_INVALID_PARAMS; + path_value = bt_value_map_borrow_entry_value_const(params, "path"); + if (!path_value) { + BT_LOGE_STR("Mandatory `path` parameter missing"); + status = BT_QUERY_STATUS_INVALID_PARAMS; goto error; } - assert(path); + if (!bt_value_is_string(path_value)) { + BT_LOGE_STR("`path` parameter is required to be a string value"); + status = BT_QUERY_STATUS_INVALID_PARAMS; + goto error; + } + + path = bt_value_string_get(path_value); + + BT_ASSERT(path); metadata_fp = ctf_fs_metadata_open_file(path); if (!metadata_fp) { BT_LOGE("Cannot open trace metadata: path=\"%s\".", path); @@ -146,14 +153,14 @@ struct bt_component_class_query_method_return metadata_info_query( g_string_append(g_metadata_text, metadata_text); - ret = bt_value_map_insert_string(query_ret.result, "text", + ret = bt_value_map_insert_string_entry(result, "text", g_metadata_text->str); if (ret) { BT_LOGE_STR("Cannot insert metadata text into query result."); goto error; } - ret = bt_value_map_insert_bool(query_ret.result, "is-packetized", + ret = bt_value_map_insert_bool_entry(result, "is-packetized", is_packetized); if (ret) { BT_LOGE_STR("Cannot insert \"is-packetized\" attribute into query result."); @@ -163,14 +170,14 @@ struct bt_component_class_query_method_return metadata_info_query( goto end; error: - BT_PUT(query_ret.result); + BT_VALUE_PUT_REF_AND_RESET(result); + result = NULL; - if (query_ret.status >= 0) { - query_ret.status = BT_QUERY_STATUS_ERROR; + if (status >= 0) { + status = BT_QUERY_STATUS_ERROR; } end: - bt_put(path_value); free(metadata_text); if (g_metadata_text) { @@ -181,16 +188,17 @@ end: fclose(metadata_fp); } - return query_ret; + *user_result = result; + return status; } static -int add_range(struct bt_value *info, struct range *range, +int add_range(bt_value *info, struct range *range, const char *range_name) { int ret = 0; - enum bt_value_status status; - struct bt_value *range_map = NULL; + bt_value_status status; + bt_value *range_map = NULL; if (!range->set) { /* Not an error. */ @@ -203,82 +211,68 @@ int add_range(struct bt_value *info, struct range *range, goto end; } - status = bt_value_map_insert_integer(range_map, "begin", + status = bt_value_map_insert_integer_entry(range_map, "begin", range->begin_ns); if (status != BT_VALUE_STATUS_OK) { ret = -1; goto end; } - status = bt_value_map_insert_integer(range_map, "end", + status = bt_value_map_insert_integer_entry(range_map, "end", range->end_ns); if (status != BT_VALUE_STATUS_OK) { ret = -1; goto end; } - status = bt_value_map_insert(info, range_name, range_map); + status = bt_value_map_insert_entry(info, range_name, + range_map); if (status != BT_VALUE_STATUS_OK) { ret = -1; goto end; } + end: - bt_put(range_map); + bt_value_put_ref(range_map); return ret; } static -int add_stream_ids(struct bt_value *info, struct bt_stream *stream) +int add_stream_ids(bt_value *info, struct ctf_fs_ds_file_group *ds_file_group) { int ret = 0; - int64_t stream_class_id, stream_instance_id; - enum bt_value_status status; - struct bt_stream_class *stream_class = NULL; - - stream_instance_id = bt_stream_get_id(stream); - if (stream_instance_id != -1) { - status = bt_value_map_insert_integer(info, "id", - stream_instance_id); + bt_value_status status; + + if (ds_file_group->stream_id != UINT64_C(-1)) { + status = bt_value_map_insert_integer_entry(info, "id", + (int64_t) ds_file_group->stream_id); if (status != BT_VALUE_STATUS_OK) { ret = -1; goto end; } } - stream_class = bt_stream_get_class(stream); - if (!stream_class) { - ret = -1; - goto end; - } - - stream_class_id = bt_stream_class_get_id(stream_class); - if (stream_class_id == -1) { - ret = -1; - goto end; - } - - status = bt_value_map_insert_integer(info, "class-id", stream_class_id); + status = bt_value_map_insert_integer_entry(info, "class-id", + (int64_t) ds_file_group->sc->id); if (status != BT_VALUE_STATUS_OK) { ret = -1; goto end; } + end: - bt_put(stream_class); return ret; } static int populate_stream_info(struct ctf_fs_ds_file_group *group, - struct bt_value *group_info, - struct range *stream_range) + bt_value *group_info, struct range *stream_range) { int ret = 0; size_t file_idx; - enum bt_value_status status; - struct bt_value *file_paths; - - stream_range->begin_ns = INT64_MAX; - stream_range->end_ns = 0; + bt_value_status status; + bt_value *file_paths; + struct ctf_fs_ds_file_info *first_file_info, *last_file_info; + struct ctf_fs_ds_index_entry *first_ds_index_entry, *last_ds_index_entry; file_paths = bt_value_array_create(); if (!file_paths) { @@ -287,10 +281,9 @@ int populate_stream_info(struct ctf_fs_ds_file_group *group, } for (file_idx = 0; file_idx < group->ds_file_infos->len; file_idx++) { - int64_t file_begin_epoch, file_end_epoch; struct ctf_fs_ds_file_info *info = - g_ptr_array_index(group->ds_file_infos, - file_idx); + g_ptr_array_index(group->ds_file_infos, + file_idx); if (!info->index || info->index->entries->len == 0) { BT_LOGW("Cannot determine range of unindexed stream file \'%s\'", @@ -299,26 +292,42 @@ int populate_stream_info(struct ctf_fs_ds_file_group *group, goto end; } - status = bt_value_array_append_string(file_paths, + status = bt_value_array_append_string_element(file_paths, info->path->str); if (status != BT_VALUE_STATUS_OK) { ret = -1; goto end; } + } - /* - * file range is from timestamp_begin of the first entry to the - * timestamp_end of the last entry. - */ - file_begin_epoch = ((struct ctf_fs_ds_index_entry *) &g_array_index(info->index->entries, - struct ctf_fs_ds_index_entry, 0))->timestamp_begin_ns; - file_end_epoch = ((struct ctf_fs_ds_index_entry *) &g_array_index(info->index->entries, - struct ctf_fs_ds_index_entry, info->index->entries->len - 1))->timestamp_end_ns; + /* + * Since `struct ctf_fs_ds_file_info` elements are sorted by value of + * `begin_ns` within the `ds_file_groups` array and `struct + * ctf_fs_ds_index_entry` elements are sorted by time within their + * respective `struct ctf_fs_ds_file_info`, we can compute the stream + * range from timestamp_begin of the first index entry of the first + * file to the timestamp_end of the last index entry of the last file. + */ + BT_ASSERT(group->ds_file_infos->len > 0); - stream_range->begin_ns = min(stream_range->begin_ns, file_begin_epoch); - stream_range->end_ns = max(stream_range->end_ns, file_end_epoch); - stream_range->set = true; - } + first_file_info = g_ptr_array_index(group->ds_file_infos, 0); + last_file_info = g_ptr_array_index(group->ds_file_infos, + group->ds_file_infos->len - 1); + + BT_ASSERT(first_file_info->index->entries->len > 0); + + first_ds_index_entry = (struct ctf_fs_ds_index_entry *) &g_array_index( + first_file_info->index->entries, struct ctf_fs_ds_index_entry, 0); + + BT_ASSERT(last_file_info->index->entries->len > 0); + + last_ds_index_entry = (struct ctf_fs_ds_index_entry *) &g_array_index( + last_file_info->index->entries, struct ctf_fs_ds_index_entry, + last_file_info->index->entries->len - 1); + + stream_range->begin_ns = first_ds_index_entry->timestamp_begin_ns; + stream_range->end_ns = last_ds_index_entry->timestamp_end_ns; + stream_range->set = true; if (stream_range->set) { ret = add_range(group_info, stream_range, "range-ns"); @@ -327,30 +336,29 @@ int populate_stream_info(struct ctf_fs_ds_file_group *group, } } - status = bt_value_map_insert(group_info, "paths", file_paths); + status = bt_value_map_insert_entry(group_info, "paths", + file_paths); if (status != BT_VALUE_STATUS_OK) { ret = -1; goto end; } - ret = add_stream_ids(group_info, group->stream); + ret = add_stream_ids(group_info, group); if (ret) { goto end; } end: - bt_put(file_paths); + bt_value_put_ref(file_paths); return ret; } static -int populate_trace_info(const char *trace_path, const char *trace_name, - struct bt_value *trace_info) +int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info) { int ret = 0; size_t group_idx; - struct ctf_fs_trace *trace = NULL; - enum bt_value_status status; - struct bt_value *file_groups; + bt_value_status status; + bt_value *file_groups = NULL; struct range trace_range = { .begin_ns = INT64_MAX, .end_ns = 0, @@ -362,42 +370,35 @@ int populate_trace_info(const char *trace_path, const char *trace_name, .set = false, }; + BT_ASSERT(trace->ds_file_groups); + /* Add trace range info only if it contains streams. */ + if (trace->ds_file_groups->len == 0) { + ret = -1; + goto end; + } + file_groups = bt_value_array_create(); if (!file_groups) { goto end; } - status = bt_value_map_insert_string(trace_info, "name", - trace_name); + status = bt_value_map_insert_string_entry(trace_info, "name", + trace->name->str); if (status != BT_VALUE_STATUS_OK) { ret = -1; goto end; } - status = bt_value_map_insert_string(trace_info, "path", - trace_path); + status = bt_value_map_insert_string_entry(trace_info, "path", + trace->path->str); if (status != BT_VALUE_STATUS_OK) { ret = -1; goto end; } - trace = ctf_fs_trace_create(trace_path, trace_name, NULL); - if (!trace) { - BT_LOGE("Failed to create fs trace at \'%s\'", trace_path); - ret = -1; - goto end; - } - - assert(trace->ds_file_groups); - /* Add trace range info only if it contains streams. */ - if (trace->ds_file_groups->len == 0) { - ret = -1; - goto end; - } - /* Find range of all stream groups, and of the trace. */ for (group_idx = 0; group_idx < trace->ds_file_groups->len; group_idx++) { - struct bt_value *group_info; + bt_value *group_info; struct range group_range = { .set = false }; struct ctf_fs_ds_file_group *group = g_ptr_array_index( trace->ds_file_groups, group_idx); @@ -410,7 +411,7 @@ int populate_trace_info(const char *trace_path, const char *trace_name, ret = populate_stream_info(group, group_info, &group_range); if (ret) { - bt_put(group_info); + bt_value_put_ref(group_info); goto end; } @@ -426,8 +427,10 @@ int populate_trace_info(const char *trace_path, const char *trace_name, trace_intersection.end_ns = min(trace_intersection.end_ns, group_range.end_ns); trace_intersection.set = true; - status = bt_value_array_append(file_groups, group_info); - bt_put(group_info); + status = bt_value_array_append_element( + file_groups, + group_info); + bt_value_put_ref(group_info); if (status != BT_VALUE_STATUS_OK) { goto end; } @@ -447,85 +450,67 @@ int populate_trace_info(const char *trace_path, const char *trace_name, } } - status = bt_value_map_insert(trace_info, "streams", file_groups); - BT_PUT(file_groups); + status = bt_value_map_insert_entry(trace_info, "streams", + file_groups); + BT_VALUE_PUT_REF_AND_RESET(file_groups); if (status != BT_VALUE_STATUS_OK) { ret = -1; goto end; } end: - bt_put(file_groups); - ctf_fs_trace_destroy(trace); + bt_value_put_ref(file_groups); return ret; } BT_HIDDEN -struct bt_component_class_query_method_return trace_info_query( - struct bt_component_class *comp_class, - struct bt_value *params) +bt_query_status trace_info_query( + bt_self_component_class_source *comp_class, + const bt_value *params, + const bt_value **user_result) { - struct bt_component_class_query_method_return query_ret = { - .result = NULL, - .status = BT_QUERY_STATUS_OK, - }; - - struct bt_value *path_value = NULL; + struct ctf_fs_component *ctf_fs = NULL; + bt_query_status status = BT_QUERY_STATUS_OK; + bt_value *result = NULL; + const bt_value *paths_value = NULL; int ret = 0; - const char *path = NULL; - GList *trace_paths = NULL; - GList *trace_names = NULL; - GList *tp_node = NULL; - GList *tn_node = NULL; - GString *normalized_path = NULL; + guint i; + + BT_ASSERT(params); if (!bt_value_is_map(params)) { BT_LOGE("Query parameters is not a map value object."); - query_ret.status = BT_QUERY_STATUS_INVALID_PARAMS; + status = BT_QUERY_STATUS_INVALID_PARAMS; goto error; } - path_value = bt_value_map_get(params, "path"); - ret = bt_value_string_get(path_value, &path); - if (ret) { - BT_LOGE("Cannot get `path` string parameter."); - query_ret.status = BT_QUERY_STATUS_INVALID_PARAMS; + ctf_fs = ctf_fs_component_create(); + if (!ctf_fs) { goto error; } - normalized_path = bt_common_normalize_path(path, NULL); - if (!normalized_path) { - BT_LOGE("Failed to normalize path: `%s`.", path); + if (!read_src_fs_parameters(params, &paths_value, ctf_fs)) { + status = BT_QUERY_STATUS_INVALID_PARAMS; goto error; } - assert(path); - ret = ctf_fs_find_traces(&trace_paths, normalized_path->str); - if (ret) { + if (ctf_fs_component_create_ctf_fs_traces(NULL, ctf_fs, paths_value)) { goto error; } - trace_names = ctf_fs_create_trace_names(trace_paths, - normalized_path->str); - if (!trace_names) { - BT_LOGE("Cannot create trace names from trace paths."); + result = bt_value_array_create(); + if (!result) { + status = BT_QUERY_STATUS_NOMEM; goto error; } - query_ret.result = bt_value_array_create(); - if (!query_ret.result) { - query_ret.status = BT_QUERY_STATUS_NOMEM; - goto error; - } + for (i = 0; i < ctf_fs->traces->len; i++) { + struct ctf_fs_trace *trace; + bt_value *trace_info; + bt_value_status status; - /* Iterates over both trace paths and names simultaneously. */ - for (tp_node = trace_paths, tn_node = trace_names; tp_node; - tp_node = g_list_next(tp_node), - tn_node = g_list_next(tn_node)) { - GString *trace_path = tp_node->data; - GString *trace_name = tn_node->data; - enum bt_value_status status; - struct bt_value *trace_info; + trace = g_ptr_array_index(ctf_fs->traces, i); + BT_ASSERT(trace); trace_info = bt_value_map_create(); if (!trace_info) { @@ -533,15 +518,14 @@ struct bt_component_class_query_method_return trace_info_query( goto error; } - ret = populate_trace_info(trace_path->str, trace_name->str, - trace_info); + ret = populate_trace_info(trace, trace_info); if (ret) { - bt_put(trace_info); + bt_value_put_ref(trace_info); goto error; } - status = bt_value_array_append(query_ret.result, trace_info); - bt_put(trace_info); + status = bt_value_array_append_element(result, trace_info); + bt_value_put_ref(trace_info); if (status != BT_VALUE_STATUS_OK) { goto error; } @@ -550,33 +534,19 @@ struct bt_component_class_query_method_return trace_info_query( goto end; error: - BT_PUT(query_ret.result); + BT_VALUE_PUT_REF_AND_RESET(result); + result = NULL; - if (query_ret.status >= 0) { - query_ret.status = BT_QUERY_STATUS_ERROR; + if (status >= 0) { + status = BT_QUERY_STATUS_ERROR; } end: - if (normalized_path) { - g_string_free(normalized_path, TRUE); + if (ctf_fs) { + ctf_fs_destroy(ctf_fs); + ctf_fs = NULL; } - if (trace_paths) { - for (tp_node = trace_paths; tp_node; tp_node = g_list_next(tp_node)) { - if (tp_node->data) { - g_string_free(tp_node->data, TRUE); - } - } - g_list_free(trace_paths); - } - if (trace_names) { - for (tn_node = trace_names; tn_node; tn_node = g_list_next(tn_node)) { - if (tn_node->data) { - g_string_free(tn_node->data, TRUE); - } - } - g_list_free(trace_names); - } - /* "path" becomes invalid with the release of path_value. */ - bt_put(path_value); - return query_ret; + + *user_result = result; + return status; }