X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fplugins%2Fctf%2Ffs-src%2Fquery.c;h=82e9c90eeb5bf8cdac53e0ab43510ad6e21a2a7a;hb=5f2a1585bf407f3f3aa7e63d9041b75390cf8563;hp=43041de30320dc7f63a4be39e11d37e575f19968;hpb=a0cd55adbf4e2cf50e153f96916c099dc9ff2399;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-src/query.c b/src/plugins/ctf/fs-src/query.c
index 43041de3..82e9c90e 100644
--- a/src/plugins/ctf/fs-src/query.c
+++ b/src/plugins/ctf/fs-src/query.c
@@ -285,11 +285,6 @@ int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info)
 	bt_value_map_insert_entry_status insert_status;
 	bt_value_array_append_element_status append_status;
 	bt_value *file_groups = NULL;
-	struct range trace_intersection = {
-		.begin_ns = 0,
-		.end_ns = INT64_MAX,
-		.set = false,
-	};
 
 	BT_ASSERT(trace->ds_file_groups);
 	/* Add trace range info only if it contains streams. */
@@ -299,7 +294,7 @@ int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info)
 	}
 
 	insert_status = bt_value_map_insert_empty_array_entry(trace_info,
-		"streams", &file_groups);
+		"stream-infos", &file_groups);
 	if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
 		ret = -1;
 		goto end;
@@ -324,22 +319,6 @@ int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info)
 		if (ret) {
 			goto end;
 		}
-
-		if (group_range.set) {
-			trace_intersection.begin_ns = MAX(trace_intersection.begin_ns,
-					group_range.begin_ns);
-			trace_intersection.end_ns = MIN(trace_intersection.end_ns,
-					group_range.end_ns);
-			trace_intersection.set = true;
-		}
-	}
-
-	if (trace_intersection.begin_ns < trace_intersection.end_ns) {
-		ret = add_range(trace_info, &trace_intersection,
-				"intersection-range-ns");
-		if (ret) {
-			goto end;
-		}
 	}
 
 end:
@@ -347,7 +326,7 @@ end:
 }
 
 BT_HIDDEN
-bt_component_class_query_method_status trace_info_query(
+bt_component_class_query_method_status trace_infos_query(
 		bt_self_component_class_source *self_comp_class_src,
 		const bt_value *params, bt_logging_level log_level,
 		const bt_value **user_result)
@@ -412,7 +391,6 @@ bt_component_class_query_method_status trace_info_query(
 
 error:
 	BT_VALUE_PUT_REF_AND_RESET(result);
-	result = NULL;
 
 	if (status >= 0) {
 		status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;