X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fquery.c;h=dd14336667784c9a77bd668402be0c7e5b296159;hb=05e2128659970c32648a01255ed870449f05d518;hp=b2830a76e8a2f1d17e2eb7c4b128e91d79001ea0;hpb=07208d85d16704b304b371897bb7acc995fcc481;p=babeltrace.git

diff --git a/plugins/ctf/fs-src/query.c b/plugins/ctf/fs-src/query.c
index b2830a76..dd143366 100644
--- a/plugins/ctf/fs-src/query.c
+++ b/plugins/ctf/fs-src/query.c
@@ -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)
+enum bt_query_status metadata_info_query(
+		struct bt_self_component_class_source *comp_class,
+		const struct bt_value *params,
+		const struct 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;
+	enum bt_query_status status = BT_QUERY_STATUS_OK;
+	struct bt_value *result = NULL;
+	const struct bt_value *path_value = NULL;
 	char *metadata_text = NULL;
 	FILE *metadata_fp = NULL;
 	GString *g_metadata_text = NULL;
@@ -64,9 +62,9 @@ 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;
 	}
 
@@ -74,17 +72,12 @@ struct bt_component_class_query_method_return metadata_info_query(
 
 	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);
@@ -148,14 +141,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_entry(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_entry(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.");
@@ -165,10 +158,11 @@ struct bt_component_class_query_method_return metadata_info_query(
 	goto end;
 
 error:
-	BT_PUT(query_ret.result);
+	BT_OBJECT_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:
@@ -182,7 +176,8 @@ end:
 		fclose(metadata_fp);
 	}
 
-	return query_ret;
+	*user_result = result;
+	return status;
 }
 
 static
@@ -218,13 +213,15 @@ int add_range(struct bt_value *info, struct range *range,
 		goto end;
 	}
 
-	status = bt_value_map_insert_entry(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_object_put_ref(range_map);
 	return ret;
 }
 
@@ -270,8 +267,7 @@ end:
 
 static
 int populate_stream_info(struct ctf_fs_ds_file_group *group,
-		struct bt_value *group_info,
-		struct range *stream_range)
+		struct bt_value *group_info, struct range *stream_range)
 {
 	int ret = 0;
 	size_t file_idx;
@@ -328,18 +324,20 @@ int populate_stream_info(struct ctf_fs_ds_file_group *group,
 		}
 	}
 
-	status = bt_value_map_insert_entry(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,
+		bt_private_stream_as_stream(group->stream));
 	if (ret) {
 		goto end;
 	}
 end:
-	bt_put(file_paths);
+	bt_object_put_ref(file_paths);
 	return ret;
 }
 
@@ -369,7 +367,7 @@ int populate_trace_info(const char *trace_path, const char *trace_name,
 	}
 
 	status = bt_value_map_insert_string_entry(trace_info, "name",
-			trace_name);
+		trace_name);
 	if (status != BT_VALUE_STATUS_OK) {
 		ret = -1;
 		goto end;
@@ -381,7 +379,7 @@ int populate_trace_info(const char *trace_path, const char *trace_name,
 		goto end;
 	}
 
-	trace = ctf_fs_trace_create(trace_path, trace_name, NULL, NULL);
+	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;
@@ -411,7 +409,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_object_put_ref(group_info);
 			goto end;
 		}
 
@@ -427,8 +425,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_element(file_groups, group_info);
-			bt_put(group_info);
+			status = bt_value_array_append_element(
+				file_groups,
+				group_info);
+			bt_object_put_ref(group_info);
 			if (status != BT_VALUE_STATUS_OK) {
 				goto end;
 			}
@@ -448,30 +448,29 @@ int populate_trace_info(const char *trace_path, const char *trace_name,
 		}
 	}
 
-	status = bt_value_map_insert_entry(trace_info, "streams", file_groups);
-	BT_PUT(file_groups);
+	status = bt_value_map_insert_entry(trace_info, "streams",
+		file_groups);
+	BT_OBJECT_PUT_REF_AND_RESET(file_groups);
 	if (status != BT_VALUE_STATUS_OK) {
 		ret = -1;
 		goto end;
 	}
 
 end:
-	bt_put(file_groups);
+	bt_object_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)
+enum bt_query_status trace_info_query(
+		struct bt_self_component_class_source *comp_class,
+		const struct bt_value *params,
+		const struct 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;
+	enum bt_query_status status = BT_QUERY_STATUS_OK;
+	struct bt_value *result = NULL;
+	const struct bt_value *path_value = NULL;
 	int ret = 0;
 	const char *path = NULL;
 	GList *trace_paths = NULL;
@@ -484,17 +483,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) {
@@ -515,9 +509,9 @@ struct bt_component_class_query_method_return trace_info_query(
 		goto error;
 	}
 
-	query_ret.result = bt_value_array_create();
-	if (!query_ret.result) {
-		query_ret.status = BT_QUERY_STATUS_NOMEM;
+	result = bt_value_array_create();
+	if (!result) {
+		status = BT_QUERY_STATUS_NOMEM;
 		goto error;
 	}
 
@@ -539,12 +533,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_put(trace_info);
+			bt_object_put_ref(trace_info);
 			goto error;
 		}
 
-		status = bt_value_array_append_element(query_ret.result, trace_info);
-		bt_put(trace_info);
+		status = bt_value_array_append_element(result, trace_info);
+		bt_object_put_ref(trace_info);
 		if (status != BT_VALUE_STATUS_OK) {
 			goto error;
 		}
@@ -553,10 +547,11 @@ struct bt_component_class_query_method_return trace_info_query(
 	goto end;
 
 error:
-	BT_PUT(query_ret.result);
+	BT_OBJECT_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:
@@ -579,6 +574,7 @@ end:
 		}
 		g_list_free(trace_names);
 	}
-	/* "path" becomes invalid with the release of path_value. */
-	return query_ret;
+
+	*user_result = result;
+	return status;
 }