X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Fevent.c;h=44019efaf5868f8e9fcbf98eac8b710835be6882;hb=35cf02cd366ec6adb2b849721e65711124a144cf;hp=e1bc85e78967f396edea4a906bec36d97159ff9a;hpb=57952005b6a6a0aeb1e4ecb0d7ac0c6786d23dba;p=babeltrace.git

diff --git a/src/ctf-writer/event.c b/src/ctf-writer/event.c
index e1bc85e7..44019efa 100644
--- a/src/ctf-writer/event.c
+++ b/src/ctf-writer/event.c
@@ -21,18 +21,18 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CTF-WRITER-EVENT"
+#define BT_LOG_TAG "CTF-WRITER/EVENT"
 #include "logging.h"
 
 #include <inttypes.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"
@@ -535,7 +535,8 @@ 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_ctf_object_put_ref(field_wrapper->field);
@@ -567,7 +568,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;
 	}
 
@@ -719,7 +720,7 @@ int bt_ctf_event_serialize(struct bt_ctf_event *event,
 	BT_ASSERT(event);
 	BT_ASSERT(ctfser);
 
-	BT_LOGV_STR("Serializing event's context field.");
+	BT_LOGT_STR("Serializing event's context field.");
 	if (event->common.context_field) {
 		ret = bt_ctf_field_serialize_recursive(
 			(void *) event->common.context_field, ctfser,
@@ -735,7 +736,7 @@ int bt_ctf_event_serialize(struct bt_ctf_event *event,
 		}
 	}
 
-	BT_LOGV_STR("Serializing event's payload field.");
+	BT_LOGT_STR("Serializing event's payload field.");
 	if (event->common.payload_field) {
 		ret = bt_ctf_field_serialize_recursive(
 			(void *) event->common.payload_field, ctfser,
@@ -791,7 +792,7 @@ int bt_ctf_event_set_header(struct bt_ctf_event *event,
 
 	bt_ctf_object_put_ref(event->common.header_field->field);
 	event->common.header_field->field = bt_ctf_object_get_ref(header);
-	BT_LOGV("Set event's header field: event-addr=%p, "
+	BT_LOGT("Set event's header field: event-addr=%p, "
 		"event-class-name=\"%s\", event-class-id=%" PRId64 ", "
 		"header-field-addr=%p",
 		event, bt_ctf_event_class_common_get_name(event->common.class),
@@ -825,7 +826,7 @@ int bt_ctf_event_common_set_payload(struct bt_ctf_event *event,
 
 	bt_ctf_object_put_ref(event->common.payload_field);
 	event->common.payload_field = bt_ctf_object_get_ref(payload);
-	BT_LOGV("Set event's payload field: event-addr=%p, "
+	BT_LOGT("Set event's payload field: event-addr=%p, "
 		"event-class-name=\"%s\", event-class-id=%" PRId64 ", "
 		"payload-field-addr=%p",
 		event, bt_ctf_event_class_common_get_name(event->common.class),
@@ -858,7 +859,7 @@ int bt_ctf_event_set_context(struct bt_ctf_event *event,
 
 	bt_ctf_object_put_ref(event->common.context_field);
 	event->common.context_field = bt_ctf_object_get_ref(context);
-	BT_LOGV("Set event's context field: event-addr=%p, "
+	BT_LOGT("Set event's context field: event-addr=%p, "
 		"event-class-name=\"%s\", event-class-id=%" PRId64 ", "
 		"context-field-addr=%p",
 		event, bt_ctf_event_class_common_get_name(event->common.class),
@@ -893,7 +894,7 @@ int bt_ctf_event_set_stream_event_context(struct bt_ctf_event *event,
 
 	bt_ctf_object_put_ref(event->common.stream_event_context_field);
 	event->common.stream_event_context_field = bt_ctf_object_get_ref(stream_event_context);
-	BT_LOGV("Set event's stream event context field: event-addr=%p, "
+	BT_LOGT("Set event's stream event context field: event-addr=%p, "
 		"event-class-name=\"%s\", event-class-id=%" PRId64 ", "
 		"stream-event-context-field-addr=%p",
 		event, bt_ctf_event_class_common_get_name(event->common.class),