X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Ftrace.c;h=804af24dc1819192e9451876f8cec190c828da63;hb=c4f23e30bf67d2523163614bc9461d84cbe1ae80;hp=3e29ce7b761fe7bdb4a419be0913213f99825748;hpb=004090977e6698a39035bb20b5ba4d5da23a6718;p=babeltrace.git

diff --git a/src/ctf-writer/trace.c b/src/ctf-writer/trace.c
index 3e29ce7b..804af24d 100644
--- a/src/ctf-writer/trace.c
+++ b/src/ctf-writer/trace.c
@@ -25,13 +25,14 @@
 #include "logging.h"
 
 #include <inttypes.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <babeltrace2/ctf-writer/event.h>
-#include <babeltrace2/ctf-writer/object.h>
-#include <babeltrace2/ctf-writer/utils.h>
+#include <babeltrace2-ctf-writer/event.h>
+#include <babeltrace2-ctf-writer/object.h>
+#include <babeltrace2-ctf-writer/utils.h>
 #include <babeltrace2/types.h>
 
 #include "common/assert.h"
@@ -473,7 +474,7 @@ bool packet_header_field_type_is_valid(struct bt_ctf_trace_common *trace,
 
 		ret = bt_ctf_field_type_common_structure_borrow_field_by_index(
 			packet_header_type, &field_name, NULL, 0);
-		BT_ASSERT(ret == 0);
+		BT_ASSERT_DBG(ret == 0);
 
 		if (strcmp(field_name, "magic") != 0) {
 			BT_LOGW("Invalid packet header field type: `magic` field must be the first field: "
@@ -509,7 +510,7 @@ bool packet_header_field_type_is_valid(struct bt_ctf_trace_common *trace,
 		}
 
 		elem_ft = bt_ctf_field_type_common_array_borrow_element_field_type(field_type);
-		BT_ASSERT(elem_ft);
+		BT_ASSERT_DBG(elem_ft);
 
 		if (elem_ft->id != BT_CTF_FIELD_TYPE_ID_INTEGER) {
 			BT_LOGW("Invalid packet header field type: `uuid` field's element field type must be an integer field type: "
@@ -829,7 +830,7 @@ bool event_header_field_type_is_valid(struct bt_ctf_trace_common *trace,
 			goto invalid;
 		}
 
-		BT_ASSERT(int_ft);
+		BT_ASSERT_DBG(int_ft);
 		if (bt_ctf_field_type_common_integer_is_signed(int_ft)) {
 			BT_LOGW("Invalid event header field type: `id` field must be an unsigned integer or enumeration field type: "
 				"id-ft-addr=%p", int_ft);
@@ -899,12 +900,12 @@ int bt_ctf_trace_common_add_stream_class(struct bt_ctf_trace_common *trace,
 	struct bt_ctf_field_type_common *packet_context_type = NULL;
 	struct bt_ctf_field_type_common *event_header_type = NULL;
 	struct bt_ctf_field_type_common *stream_event_ctx_type = NULL;
-	int64_t event_class_count;
+	int64_t event_class_count = 0;
 	struct bt_ctf_trace_common *current_parent_trace = NULL;
 	struct bt_ctf_clock_class *expected_clock_class =
 		bt_ctf_object_get_ref(init_expected_clock_class);
 
-	BT_ASSERT(copy_field_type_func);
+	BT_ASSERT_DBG(copy_field_type_func);
 
 	if (!trace) {
 		BT_LOGW_STR("Invalid parameter: trace is NULL.");
@@ -940,7 +941,7 @@ int bt_ctf_trace_common_add_stream_class(struct bt_ctf_trace_common *trace,
 
 	event_class_count =
 		bt_ctf_stream_class_common_get_event_class_count(stream_class);
-	BT_ASSERT(event_class_count >= 0);
+	BT_ASSERT_DBG(event_class_count >= 0);
 
 	if (!stream_class->frozen) {
 		/*
@@ -1261,8 +1262,8 @@ bt_ctf_bool bt_ctf_trace_common_has_clock_class(struct bt_ctf_trace_common *trac
 {
 	struct bt_ctf_search_query query = { .value = clock_class, .found = 0 };
 
-	BT_ASSERT(trace);
-	BT_ASSERT(clock_class);
+	BT_ASSERT_DBG(trace);
+	BT_ASSERT_DBG(clock_class);
 
 	g_ptr_array_foreach(trace->clock_classes, value_exists, &query);
 	return query.found;
@@ -1685,7 +1686,7 @@ int append_trace_metadata(struct bt_ctf_trace *trace,
 	g_string_append(context->string, "trace {\n");
 	g_string_append(context->string, "\tmajor = 1;\n");
 	g_string_append(context->string, "\tminor = 8;\n");
-	BT_ASSERT(trace->common.native_byte_order == BT_CTF_BYTE_ORDER_LITTLE_ENDIAN ||
+	BT_ASSERT_DBG(trace->common.native_byte_order == BT_CTF_BYTE_ORDER_LITTLE_ENDIAN ||
 		trace->common.native_byte_order == BT_CTF_BYTE_ORDER_BIG_ENDIAN ||
 		trace->common.native_byte_order == BT_CTF_BYTE_ORDER_NETWORK);
 
@@ -1740,8 +1741,8 @@ void append_env_metadata(struct bt_ctf_trace *trace,
 		env_field_value_obj = bt_ctf_attributes_borrow_field_value(
 			trace->common.environment, i);
 
-		BT_ASSERT(entry_name);
-		BT_ASSERT(env_field_value_obj);
+		BT_ASSERT_DBG(entry_name);
+		BT_ASSERT_DBG(env_field_value_obj);
 
 		switch (bt_ctf_value_get_type(
 			bt_ctf_private_value_as_value(env_field_value_obj))) {