X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Fevent.c;h=7cbf6c59fd7ac09d3ea8eadf7190c282b775dfd9;hb=c4f23e30bf67d2523163614bc9461d84cbe1ae80;hp=a470687678eab5a9a84e49dd387a951f410b9ea5;hpb=ef267d12284b855bc52ee429a5dc12da1d1e3b95;p=babeltrace.git

diff --git a/src/ctf-writer/event.c b/src/ctf-writer/event.c
index a4706876..7cbf6c59 100644
--- a/src/ctf-writer/event.c
+++ b/src/ctf-writer/event.c
@@ -25,14 +25,15 @@
 #include "logging.h"
 
 #include <inttypes.h>
+#include <stdbool.h>
 
-#include <babeltrace2/ctf-writer/event.h>
-#include <babeltrace2/ctf-writer/fields.h>
-#include <babeltrace2/ctf-writer/field-types.h>
-#include <babeltrace2/ctf-writer/object.h>
-#include <babeltrace2/ctf-writer/stream-class.h>
-#include <babeltrace2/ctf-writer/trace.h>
-#include <babeltrace2/ctf-writer/utils.h>
+#include <babeltrace2-ctf-writer/event.h>
+#include <babeltrace2-ctf-writer/fields.h>
+#include <babeltrace2-ctf-writer/field-types.h>
+#include <babeltrace2-ctf-writer/object.h>
+#include <babeltrace2-ctf-writer/stream-class.h>
+#include <babeltrace2-ctf-writer/trace.h>
+#include <babeltrace2-ctf-writer/utils.h>
 
 #include "common/assert.h"
 #include "compat/compiler.h"
@@ -72,14 +73,14 @@ int bt_ctf_event_common_validate_types_for_create(
 	struct bt_ctf_private_value *environment = NULL;
 
 	stream_class = bt_ctf_event_class_common_borrow_stream_class(event_class);
-	BT_ASSERT(stream_class);
+	BT_ASSERT_DBG(stream_class);
 	trace = bt_ctf_stream_class_common_borrow_trace(stream_class);
 	if (trace) {
 		BT_LOGD_STR("Event class is part of a trace.");
 		packet_header_type =
 			bt_ctf_trace_common_borrow_packet_header_field_type(trace);
 		trace_valid = trace->valid;
-		BT_ASSERT(trace_valid);
+		BT_ASSERT_DBG(trace_valid);
 		environment = trace->environment;
 	}
 
@@ -132,10 +133,10 @@ static
 int bt_ctf_event_common_create_fields(
 		struct bt_ctf_stream_class_common *stream_class,
 		struct bt_ctf_validation_output *validation_output,
-		create_field_func create_field_func,
-		release_field_func release_field_func,
-		create_header_field_func create_header_field_func,
-		release_header_field_func release_header_field_func,
+		create_field_func_type create_field_func,
+		release_field_func_type release_field_func,
+		create_header_field_func_type create_header_field_func,
+		release_header_field_func_type release_header_field_func,
 		struct bt_ctf_field_wrapper **header_field,
 		struct bt_ctf_field_common **stream_event_context_field,
 		struct bt_ctf_field_common **context_field,
@@ -219,7 +220,7 @@ int _bt_ctf_event_common_validate(struct bt_ctf_event_common *event)
 	int ret = 0;
 	struct bt_ctf_stream_class_common *stream_class;
 
-	BT_ASSERT(event);
+	BT_ASSERT_DBG(event);
 	if (event->header_field) {
 		ret = bt_ctf_field_common_validate_recursive(
 			event->header_field->field);
@@ -237,7 +238,7 @@ int _bt_ctf_event_common_validate(struct bt_ctf_event_common *event)
 	 * We should not have been able to create the event without associating
 	 * the event class to a stream class.
 	 */
-	BT_ASSERT(stream_class);
+	BT_ASSERT_DBG(stream_class);
 
 	if (stream_class->event_context_field_type) {
 		ret = bt_ctf_field_common_validate_recursive(
@@ -276,7 +277,7 @@ BT_HIDDEN
 void _bt_ctf_event_common_set_is_frozen(struct bt_ctf_event_common *event,
 		bool is_frozen)
 {
-	BT_ASSERT(event);
+	BT_ASSERT_DBG(event);
 	BT_LOGD("Freezing event: addr=%p, "
 		"event-class-name=\"%s\", event-class-id=%" PRId64,
 		event, bt_ctf_event_class_common_get_name(event->class),
@@ -319,10 +320,10 @@ int bt_ctf_event_common_initialize(struct bt_ctf_event_common *event,
 		int (*map_clock_classes_func)(struct bt_ctf_stream_class_common *stream_class,
 			struct bt_ctf_field_type_common *packet_context_field_type,
 			struct bt_ctf_field_type_common *event_header_field_type),
-		create_field_func create_field_func,
-		release_field_func release_field_func,
-		create_header_field_func create_header_field_func,
-		release_header_field_func release_header_field_func)
+		create_field_func_type create_field_func,
+		release_field_func_type release_field_func,
+		create_header_field_func_type create_header_field_func,
+		release_header_field_func_type release_header_field_func)
 {
 	int ret;
 	struct bt_ctf_trace_common *trace = NULL;
@@ -348,7 +349,7 @@ int bt_ctf_event_common_initialize(struct bt_ctf_event_common *event,
 		event_class);
 
 	/* The event class was frozen when added to its stream class */
-	BT_ASSERT(event_class->frozen);
+	BT_ASSERT_DBG(event_class->frozen);
 	trace = bt_ctf_stream_class_common_borrow_trace(stream_class);
 
 	if (must_be_in_trace) {
@@ -518,6 +519,7 @@ end:
 	return ret;
 }
 
+static
 int map_clock_classes_func(struct bt_ctf_stream_class_common *stream_class,
 		struct bt_ctf_field_type_common *packet_context_type,
 		struct bt_ctf_field_type_common *event_header_type)
@@ -535,9 +537,10 @@ int map_clock_classes_func(struct bt_ctf_stream_class_common *stream_class,
 }
 
 static
-void destroy_event_header_field(struct bt_ctf_field_wrapper *field_wrapper)
+void destroy_event_header_field(struct bt_ctf_field_wrapper *field_wrapper,
+		struct bt_ctf_stream_class *stream_class)
 {
-	BT_ASSERT(field_wrapper);
+	BT_ASSERT_DBG(field_wrapper);
 	bt_ctf_object_put_ref(field_wrapper->field);
 	bt_ctf_field_wrapper_destroy(field_wrapper);
 }
@@ -567,7 +570,7 @@ error:
 	bt_ctf_object_put_ref(field);
 
 	if (field_wrapper) {
-		destroy_event_header_field(field_wrapper);
+		destroy_event_header_field(field_wrapper, stream_class);
 		field_wrapper = NULL;
 	}
 
@@ -579,7 +582,7 @@ static
 void release_event_header_field(struct bt_ctf_field_wrapper *field_wrapper,
 		struct bt_ctf_event_common *event_common)
 {
-	BT_ASSERT(field_wrapper);
+	BT_ASSERT_DBG(field_wrapper);
 	BT_CTF_OBJECT_PUT_REF_AND_RESET(field_wrapper->field);
 	bt_ctf_field_wrapper_destroy(field_wrapper);
 }
@@ -620,10 +623,10 @@ struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class)
 		(bt_ctf_validation_flag_copy_field_type_func)
 			bt_ctf_field_type_copy,
 		false, map_clock_classes_func,
-		(create_field_func) bt_ctf_field_create,
-		(release_field_func) bt_ctf_object_put_ref,
-		(create_header_field_func) create_event_header_field,
-		(release_header_field_func) destroy_event_header_field);
+		(create_field_func_type) bt_ctf_field_create,
+		(release_field_func_type) bt_ctf_object_put_ref,
+		(create_header_field_func_type) create_event_header_field,
+		(release_header_field_func_type) destroy_event_header_field);
 	if (ret) {
 		/* bt_ctf_event_common_initialize() logs errors */
 		goto error;
@@ -644,10 +647,10 @@ struct bt_ctf_event_class *bt_ctf_event_get_class(struct bt_ctf_event *event)
 	return bt_ctf_object_get_ref(bt_ctf_event_common_borrow_class(BT_CTF_TO_COMMON(event)));
 }
 
-BT_HIDDEN
+static
 struct bt_ctf_stream *bt_ctf_event_borrow_stream(struct bt_ctf_event *event)
 {
-	BT_ASSERT(event);
+	BT_ASSERT_DBG(event);
 	return (struct bt_ctf_stream *)
 		bt_ctf_object_borrow_parent(&BT_CTF_TO_COMMON(event)->base);
 }
@@ -716,8 +719,8 @@ int bt_ctf_event_serialize(struct bt_ctf_event *event,
 {
 	int ret = 0;
 
-	BT_ASSERT(event);
-	BT_ASSERT(ctfser);
+	BT_ASSERT_DBG(event);
+	BT_ASSERT_DBG(ctfser);
 
 	BT_LOGT_STR("Serializing event's context field.");
 	if (event->common.context_field) {
@@ -755,12 +758,6 @@ end:
 	return ret;
 }
 
-BT_HIDDEN
-void _bt_ctf_event_freeze(struct bt_ctf_event *event)
-{
-	_bt_ctf_event_common_set_is_frozen(BT_CTF_TO_COMMON(event), true);
-}
-
 int bt_ctf_event_set_header(struct bt_ctf_event *event,
 		struct bt_ctf_field *header)
 {