X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fquery.c;h=0e2fb991b088eb57215bf306e9b2e94b163a33ba;hb=60363f2f63bbcb6ede3c5734b36eee9f9b1d1191;hp=eef9e9ee0f7809cf97d2f12452d424bc3f9a56c5;hpb=da91b29ad2964b85601e25843f1dca92f6c97406;p=babeltrace.git diff --git a/plugins/ctf/fs-src/query.c b/plugins/ctf/fs-src/query.c index eef9e9ee..0e2fb991 100644 --- a/plugins/ctf/fs-src/query.c +++ b/plugins/ctf/fs-src/query.c @@ -46,17 +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_private_value *result = NULL; - 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; @@ -65,28 +62,22 @@ struct bt_component_class_query_method_return metadata_info_query( const char *path; bool is_packetized; - result = bt_private_value_map_create(); + result = bt_value_map_create(); if (!result) { - query_ret.status = BT_QUERY_STATUS_NOMEM; + status = BT_QUERY_STATUS_NOMEM; goto error; } - query_ret.result = bt_value_borrow_from_private(result); 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_borrow_entry_value(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; - goto error; - } + path_value = bt_value_map_borrow_entry_value_const(params, "path"); + path = bt_value_string_get(path_value); BT_ASSERT(path); metadata_fp = ctf_fs_metadata_open_file(path); @@ -150,14 +141,14 @@ struct bt_component_class_query_method_return metadata_info_query( g_string_append(g_metadata_text, metadata_text); - ret = bt_private_value_map_insert_string_entry(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_private_value_map_insert_bool_entry(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."); @@ -167,11 +158,11 @@ struct bt_component_class_query_method_return metadata_info_query( goto end; error: - BT_OBJECT_PUT_REF_AND_RESET(result); - query_ret.result = NULL; + 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: @@ -185,85 +176,72 @@ end: fclose(metadata_fp); } - return query_ret; + *user_result = result; + return status; } static -int add_range(struct bt_private_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_private_value *range_map = NULL; + bt_value_status status; + bt_value *range_map = NULL; if (!range->set) { /* Not an error. */ goto end; } - range_map = bt_private_value_map_create(); + range_map = bt_value_map_create(); if (!range_map) { ret = -1; goto end; } - status = bt_private_value_map_insert_integer_entry(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_private_value_map_insert_integer_entry(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_private_value_map_insert_entry(info, range_name, - bt_value_borrow_from_private(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_object_put_ref(range_map); + bt_value_put_ref(range_map); return ret; } static -int add_stream_ids(struct bt_private_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_private_value_map_insert_integer_entry(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_borrow_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_private_value_map_insert_integer_entry(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; @@ -275,18 +253,17 @@ end: static int populate_stream_info(struct ctf_fs_ds_file_group *group, - struct bt_private_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_private_value *file_paths; + bt_value_status status; + bt_value *file_paths; stream_range->begin_ns = INT64_MAX; stream_range->end_ns = 0; - file_paths = bt_private_value_array_create(); + file_paths = bt_value_array_create(); if (!file_paths) { ret = -1; goto end; @@ -295,8 +272,8 @@ 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\'", @@ -305,7 +282,7 @@ int populate_stream_info(struct ctf_fs_ds_file_group *group, goto end; } - status = bt_private_value_array_append_string_element(file_paths, + status = bt_value_array_append_string_element(file_paths, info->path->str); if (status != BT_VALUE_STATUS_OK) { ret = -1; @@ -333,31 +310,31 @@ int populate_stream_info(struct ctf_fs_ds_file_group *group, } } - status = bt_private_value_map_insert_entry(group_info, "paths", - bt_value_borrow_from_private(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_object_put_ref(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_private_value *trace_info) + bt_value *trace_info) { int ret = 0; size_t group_idx; struct ctf_fs_trace *trace = NULL; - enum bt_value_status status; - struct bt_private_value *file_groups; + bt_value_status status; + bt_value *file_groups; struct range trace_range = { .begin_ns = INT64_MAX, .end_ns = 0, @@ -369,25 +346,25 @@ int populate_trace_info(const char *trace_path, const char *trace_name, .set = false, }; - file_groups = bt_private_value_array_create(); + file_groups = bt_value_array_create(); if (!file_groups) { goto end; } - status = bt_private_value_map_insert_string_entry(trace_info, "name", + status = bt_value_map_insert_string_entry(trace_info, "name", trace_name); if (status != BT_VALUE_STATUS_OK) { ret = -1; goto end; } - status = bt_private_value_map_insert_string_entry(trace_info, "path", + status = bt_value_map_insert_string_entry(trace_info, "path", trace_path); if (status != BT_VALUE_STATUS_OK) { ret = -1; goto end; } - trace = ctf_fs_trace_create(trace_path, trace_name, NULL, NULL); + trace = ctf_fs_trace_create(NULL, trace_path, trace_name, NULL); if (!trace) { BT_LOGE("Failed to create fs trace at \'%s\'", trace_path); ret = -1; @@ -404,12 +381,12 @@ int populate_trace_info(const char *trace_path, const char *trace_name, /* 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_private_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); - group_info = bt_private_value_map_create(); + group_info = bt_value_map_create(); if (!group_info) { ret = -1; goto end; @@ -417,7 +394,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_object_put_ref(group_info); + bt_value_put_ref(group_info); goto end; } @@ -433,10 +410,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_private_value_array_append_element( + status = bt_value_array_append_element( file_groups, - bt_value_borrow_from_private(group_info)); - bt_object_put_ref(group_info); + group_info); + bt_value_put_ref(group_info); if (status != BT_VALUE_STATUS_OK) { goto end; } @@ -456,32 +433,29 @@ int populate_trace_info(const char *trace_path, const char *trace_name, } } - status = bt_private_value_map_insert_entry(trace_info, "streams", - bt_value_borrow_from_private(file_groups)); - BT_OBJECT_PUT_REF_AND_RESET(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_object_put_ref(file_groups); + bt_value_put_ref(file_groups); ctf_fs_trace_destroy(trace); 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_private_value *result = NULL; - struct bt_value *path_value = NULL; + bt_query_status status = BT_QUERY_STATUS_OK; + bt_value *result = NULL; + const bt_value *path_value = NULL; int ret = 0; const char *path = NULL; GList *trace_paths = NULL; @@ -494,17 +468,12 @@ struct bt_component_class_query_method_return trace_info_query( 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_borrow_entry_value(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; - goto error; - } + path_value = bt_value_map_borrow_entry_value_const(params, "path"); + path = bt_value_string_get(path_value); normalized_path = bt_common_normalize_path(path, NULL); if (!normalized_path) { @@ -525,24 +494,22 @@ struct bt_component_class_query_method_return trace_info_query( goto error; } - result = bt_private_value_array_create(); + result = bt_value_array_create(); if (!result) { - query_ret.status = BT_QUERY_STATUS_NOMEM; + status = BT_QUERY_STATUS_NOMEM; goto error; } - query_ret.result = bt_value_borrow_from_private(result); - /* 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_private_value *trace_info; + bt_value_status status; + bt_value *trace_info; - trace_info = bt_private_value_map_create(); + trace_info = bt_value_map_create(); if (!trace_info) { BT_LOGE("Failed to create trace info map."); goto error; @@ -551,13 +518,12 @@ struct bt_component_class_query_method_return trace_info_query( ret = populate_trace_info(trace_path->str, trace_name->str, trace_info); if (ret) { - bt_object_put_ref(trace_info); + bt_value_put_ref(trace_info); goto error; } - status = bt_private_value_array_append_element(result, - bt_value_borrow_from_private(trace_info)); - bt_object_put_ref(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; } @@ -566,11 +532,11 @@ struct bt_component_class_query_method_return trace_info_query( goto end; error: - BT_OBJECT_PUT_REF_AND_RESET(result); - query_ret.result = NULL; + 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: @@ -593,6 +559,7 @@ end: } g_list_free(trace_names); } - /* "path" becomes invalid with the release of path_value. */ - return query_ret; + + *user_result = result; + return status; }