Replace assert() -> BT_ASSERT() and some preconditions with BT_ASSERT_PRE()

[babeltrace.git] / plugins / ctf / fs-src / query.c

diff --git a/plugins/ctf/fs-src/query.c b/plugins/ctf/fs-src/query.c
index c5e2be8ca333def9329cdec299bcafabb69c8803..04ab457f32b8f97467e5d03deb5fe861f2bd559a 100644 (file)
--- a/plugins/ctf/fs-src/query.c
+++ b/plugins/ctf/fs-src/query.c
@@ -26,7 +26,7 @@
 
 #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>
@@ -70,6 +70,8 @@ struct bt_component_class_query_method_return metadata_info_query(
                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;
@@ -84,7 +86,7 @@ struct bt_component_class_query_method_return metadata_info_query(
                goto error;
        }
 
-       assert(path);
+       BT_ASSERT(path);
        metadata_fp = ctf_fs_metadata_open_file(path);
        if (!metadata_fp) {
                BT_LOGE("Cannot open trace metadata: path=\"%s\".", path);
@@ -228,14 +230,14 @@ end:
 }
 
 static
-int add_stream_ids(struct bt_value *info, struct bt_ctf_stream *stream)
+int add_stream_ids(struct bt_value *info, struct 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 = NULL;
+       struct 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",
                                stream_instance_id);
@@ -245,13 +247,13 @@ 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_get_class(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;
@@ -387,7 +389,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;
@@ -438,10 +440,13 @@ 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);
@@ -476,6 +481,8 @@ struct bt_component_class_query_method_return trace_info_query(
        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.");
                query_ret.status = BT_QUERY_STATUS_INVALID_PARAMS;
@@ -495,7 +502,7 @@ struct bt_component_class_query_method_return trace_info_query(
                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) {