X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fquery.c;h=0cdf22c1e87e28fde9e20155f679e97dd4016b95;hb=b19ff26f04df428047676dd736bd7cc9473906fe;hp=6fa7446f1e4119b0c3899a917f1659cff6301501;hpb=97ade20be9c0184f651dc247a19e68a11afdeab3;p=babeltrace.git

diff --git a/plugins/ctf/fs-src/query.c b/plugins/ctf/fs-src/query.c
index 6fa7446f..0cdf22c1 100644
--- a/plugins/ctf/fs-src/query.c
+++ b/plugins/ctf/fs-src/query.c
@@ -26,12 +26,12 @@
 
 #include "query.h"
 #include <stdbool.h>
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
 #include "metadata.h"
 #include "../common/metadata/decoder.h"
 #include <babeltrace/common-internal.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/ctf-ir/stream.h>
+#include <babeltrace/babeltrace.h>
 #include "fs.h"
 
 #define BT_LOG_TAG "PLUGIN-CTF-FS-QUERY-SRC"
@@ -46,11 +46,14 @@ struct range {
 };
 
 BT_HIDDEN
-struct bt_value *metadata_info_query(struct bt_component_class *comp_class,
-		struct bt_value *params)
+enum bt_query_status metadata_info_query(
+		bt_self_component_class_source *comp_class,
+		const bt_value *params,
+		const bt_value **user_result)
 {
-	struct bt_value *result = NULL;
-	struct bt_value *path_value = NULL;
+	enum 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;
@@ -61,28 +64,25 @@ struct bt_value *metadata_info_query(struct bt_component_class *comp_class,
 
 	result = bt_value_map_create();
 	if (!result) {
+		status = BT_QUERY_STATUS_NOMEM;
 		goto error;
 	}
 
+	BT_ASSERT(params);
+
 	if (!bt_value_is_map(params)) {
-		fprintf(stderr,
-			"Query parameters is not a map value object\n");
+		BT_LOGE_STR("Query parameters is not a map value object.");
+		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) {
-		fprintf(stderr,
-			"Cannot get `path` string parameter\n");
-		goto error;
-	}
+	path_value = bt_value_map_borrow_entry_value_const(params, "path");
+	path = bt_value_string_get(path_value);
 
-	assert(path);
+	BT_ASSERT(path);
 	metadata_fp = ctf_fs_metadata_open_file(path);
 	if (!metadata_fp) {
-		fprintf(stderr,
-			"Cannot open trace at path `%s`\n", path);
+		BT_LOGE("Cannot open trace metadata: path=\"%s\".", path);
 		goto error;
 	}
 
@@ -93,26 +93,35 @@ struct bt_value *metadata_info_query(struct bt_component_class *comp_class,
 		ret = ctf_metadata_decoder_packetized_file_stream_to_buf(
 			metadata_fp, &metadata_text, bo);
 		if (ret) {
-			fprintf(stderr,
-				"Cannot decode packetized metadata file\n");
+			BT_LOGE("Cannot decode packetized metadata file: path=\"%s\"",
+				path);
 			goto error;
 		}
 	} else {
 		long filesize;
 
-		fseek(metadata_fp, 0, SEEK_END);
+		ret = fseek(metadata_fp, 0, SEEK_END);
+		if (ret) {
+			BT_LOGE_ERRNO("Failed to seek to the end of the metadata file",
+				": path=\"%s\"", path);
+			goto error;
+		}
 		filesize = ftell(metadata_fp);
+		if (filesize < 0) {
+			BT_LOGE_ERRNO("Failed to get the current position in the metadata file",
+				": path=\"%s\"", path);
+			goto error;
+		}
 		rewind(metadata_fp);
 		metadata_text = malloc(filesize + 1);
 		if (!metadata_text) {
-			fprintf(stderr,
-				"Cannot allocate buffer for metadata text\n");
+			BT_LOGE_STR("Cannot allocate buffer for metadata text.");
 			goto error;
 		}
 
 		if (fread(metadata_text, filesize, 1, metadata_fp) != 1) {
-			fprintf(stderr,
-				"Cannot read metadata file\n");
+			BT_LOGE_ERRNO("Cannot read metadata file", ": path=\"%s\"",
+				path);
 			goto error;
 		}
 
@@ -132,27 +141,31 @@ struct bt_value *metadata_info_query(struct bt_component_class *comp_class,
 
 	g_string_append(g_metadata_text, metadata_text);
 
-	ret = bt_value_map_insert_string(result, "text",
+	ret = bt_value_map_insert_string_entry(result, "text",
 		g_metadata_text->str);
 	if (ret) {
-		fprintf(stderr, "Cannot insert metadata text into result\n");
+		BT_LOGE_STR("Cannot insert metadata text into query result.");
 		goto error;
 	}
 
-	ret = bt_value_map_insert_bool(result, "is-packetized",
+	ret = bt_value_map_insert_bool_entry(result, "is-packetized",
 		is_packetized);
 	if (ret) {
-		fprintf(stderr, "Cannot insert is packetized into result\n");
+		BT_LOGE_STR("Cannot insert \"is-packetized\" attribute into query result.");
 		goto error;
 	}
 
 	goto end;
 
 error:
-	BT_PUT(result);
+	BT_VALUE_PUT_REF_AND_RESET(result);
+	result = NULL;
+
+	if (status >= 0) {
+		status = BT_QUERY_STATUS_ERROR;
+	}
 
 end:
-	bt_put(path_value);
 	free(metadata_text);
 
 	if (g_metadata_text) {
@@ -162,15 +175,18 @@ end:
 	if (metadata_fp) {
 		fclose(metadata_fp);
 	}
-	return result;
+
+	*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 *range_map = NULL;
 
 	if (!range->set) {
 		/* Not an error. */
@@ -183,41 +199,43 @@ 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_ctf_stream *stream)
+int add_stream_ids(bt_value *info, const bt_stream *stream)
 {
 	int ret = 0;
 	int64_t stream_class_id, stream_instance_id;
 	enum bt_value_status status;
-	struct bt_ctf_stream_class *stream_class;
+	const bt_stream_class *stream_class = NULL;
 
-	stream_instance_id = bt_ctf_stream_get_id(stream);
+	stream_instance_id = bt_stream_get_id(stream);
 	if (stream_instance_id != -1) {
-		status = bt_value_map_insert_integer(info, "id",
+		status = bt_value_map_insert_integer_entry(info, "id",
 				stream_instance_id);
 		if (status != BT_VALUE_STATUS_OK) {
 			ret = -1;
@@ -225,37 +243,36 @@ int add_stream_ids(struct bt_value *info, struct bt_ctf_stream *stream)
 		}
 	}
 
-	stream_class = bt_ctf_stream_get_class(stream);
+	stream_class = bt_stream_borrow_class_const(stream);
 	if (!stream_class) {
 		ret = -1;
 		goto end;
 	}
 
-	stream_class_id = bt_ctf_stream_class_get_id(stream_class);
+	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", stream_class_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;
+	bt_value *file_paths;
 
 	stream_range->begin_ns = INT64_MAX;
 	stream_range->end_ns = 0;
@@ -279,7 +296,7 @@ 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;
@@ -307,7 +324,8 @@ 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;
@@ -318,19 +336,19 @@ int populate_stream_info(struct ctf_fs_ds_file_group *group,
 		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)
+		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 *file_groups;
 	struct range trace_range = {
 		.begin_ns = INT64_MAX,
 		.end_ns = 0,
@@ -347,13 +365,13 @@ int populate_trace_info(const char *trace_path, const char *trace_name,
 		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);
 	if (status != BT_VALUE_STATUS_OK) {
 		ret = -1;
 		goto end;
 	}
-	status = bt_value_map_insert_string(trace_info, "path",
+	status = bt_value_map_insert_string_entry(trace_info, "path",
 			trace_path);
 	if (status != BT_VALUE_STATUS_OK) {
 		ret = -1;
@@ -367,7 +385,7 @@ int populate_trace_info(const char *trace_path, const char *trace_name,
 		goto end;
 	}
 
-	assert(trace->ds_file_groups);
+	BT_ASSERT(trace->ds_file_groups);
 	/* Add trace range info only if it contains streams. */
 	if (trace->ds_file_groups->len == 0) {
 		ret = -1;
@@ -377,7 +395,7 @@ 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_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);
@@ -390,7 +408,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;
 		}
 
@@ -406,8 +424,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;
 			}
@@ -418,31 +438,38 @@ int populate_trace_info(const char *trace_path, const char *trace_name,
 	if (ret) {
 		goto end;
 	}
-	ret = add_range(trace_info, &trace_intersection,
-			"intersection-range-ns");
-	if (ret) {
-		goto end;
+
+	if (trace_intersection.begin_ns < trace_intersection.end_ns) {
+		ret = add_range(trace_info, &trace_intersection,
+				"intersection-range-ns");
+		if (ret) {
+			goto end;
+		}
 	}
 
-	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);
+	bt_value_put_ref(file_groups);
 	ctf_fs_trace_destroy(trace);
 	return ret;
 }
 
 BT_HIDDEN
-struct bt_value *trace_info_query(struct bt_component_class *comp_class,
-		struct bt_value *params)
+enum bt_query_status trace_info_query(
+		bt_self_component_class_source *comp_class,
+		const bt_value *params,
+		const bt_value **user_result)
 {
-	struct bt_value *trace_infos = NULL;
-	struct bt_value *path_value = NULL;
+	enum 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;
@@ -451,24 +478,23 @@ struct bt_value *trace_info_query(struct bt_component_class *comp_class,
 	GList *tn_node = NULL;
 	GString *normalized_path = NULL;
 
+	BT_ASSERT(params);
+
 	if (!bt_value_is_map(params)) {
 		BT_LOGE("Query parameters is not a map value object.");
+		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.");
-		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) {
 		BT_LOGE("Failed to normalize path: `%s`.", path);
 		goto error;
 	}
-	assert(path);
+	BT_ASSERT(path);
 
 	ret = ctf_fs_find_traces(&trace_paths, normalized_path->str);
 	if (ret) {
@@ -482,8 +508,9 @@ struct bt_value *trace_info_query(struct bt_component_class *comp_class,
 		goto error;
 	}
 
-	trace_infos = bt_value_array_create();
-	if (!trace_infos) {
+	result = bt_value_array_create();
+	if (!result) {
+		status = BT_QUERY_STATUS_NOMEM;
 		goto error;
 	}
 
@@ -494,7 +521,7 @@ struct bt_value *trace_info_query(struct bt_component_class *comp_class,
 		GString *trace_path = tp_node->data;
 		GString *trace_name = tn_node->data;
 		enum bt_value_status status;
-		struct bt_value *trace_info;
+		bt_value *trace_info;
 
 		trace_info = bt_value_map_create();
 		if (!trace_info) {
@@ -505,12 +532,12 @@ struct bt_value *trace_info_query(struct bt_component_class *comp_class,
 		ret = populate_trace_info(trace_path->str, trace_name->str,
 			trace_info);
 		if (ret) {
-			bt_put(trace_info);
+			bt_value_put_ref(trace_info);
 			goto error;
 		}
 
-		status = bt_value_array_append(trace_infos, 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;
 		}
@@ -519,7 +546,13 @@ struct bt_value *trace_info_query(struct bt_component_class *comp_class,
 	goto end;
 
 error:
-	BT_PUT(trace_infos);
+	BT_VALUE_PUT_REF_AND_RESET(result);
+	result = NULL;
+
+	if (status >= 0) {
+		status = BT_QUERY_STATUS_ERROR;
+	}
+
 end:
 	if (normalized_path) {
 		g_string_free(normalized_path, TRUE);
@@ -540,7 +573,7 @@ end:
 		}
 		g_list_free(trace_names);
 	}
-	/* "path" becomes invalid with the release of path_value. */
-	bt_put(path_value);
-	return trace_infos;
+
+	*user_result = result;
+	return status;
 }