X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Fevent.c;h=5f0948568cc38581eda580133e00e135d5223f6d;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=d65d76379f37240d2bd701ab7e26cdf2bd210270;hpb=c5b9b4417bedfbec9b5dd23b8395ccdd4eeffc44;p=babeltrace.git

diff --git a/lib/trace-ir/event.c b/lib/trace-ir/event.c
index d65d7637..5f094856 100644
--- a/lib/trace-ir/event.c
+++ b/lib/trace-ir/event.c
@@ -22,31 +22,27 @@
  */
 
 #define BT_LOG_TAG "EVENT"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/trace-ir/field-internal.h>
-#include <babeltrace/trace-ir/field-class-internal.h>
-#include <babeltrace/trace-ir/clock-class.h>
-#include <babeltrace/trace-ir/clock-value-const.h>
-#include <babeltrace/trace-ir/clock-value-internal.h>
-#include <babeltrace/trace-ir/clock-class-internal.h>
-#include <babeltrace/trace-ir/event-const.h>
-#include <babeltrace/trace-ir/event-internal.h>
-#include <babeltrace/trace-ir/event-class.h>
-#include <babeltrace/trace-ir/event-class-internal.h>
-#include <babeltrace/trace-ir/stream-class.h>
-#include <babeltrace/trace-ir/stream-class-const.h>
-#include <babeltrace/trace-ir/stream-class-internal.h>
-#include <babeltrace/trace-ir/stream-internal.h>
-#include <babeltrace/trace-ir/packet.h>
-#include <babeltrace/trace-ir/packet-internal.h>
-#include <babeltrace/trace-ir/trace.h>
-#include <babeltrace/trace-ir/trace-internal.h>
-#include <babeltrace/trace-ir/packet-internal.h>
-#include <babeltrace/trace-ir/attributes-internal.h>
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/compiler-internal.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/trace-ir/field-internal.h>
+#include <babeltrace2/trace-ir/field-class-internal.h>
+#include <babeltrace2/trace-ir/event-const.h>
+#include <babeltrace2/trace-ir/event-internal.h>
+#include <babeltrace2/trace-ir/event-class.h>
+#include <babeltrace2/trace-ir/event-class-internal.h>
+#include <babeltrace2/trace-ir/stream-class.h>
+#include <babeltrace2/trace-ir/stream-class-const.h>
+#include <babeltrace2/trace-ir/stream-class-internal.h>
+#include <babeltrace2/trace-ir/stream-internal.h>
+#include <babeltrace2/trace-ir/packet.h>
+#include <babeltrace2/trace-ir/packet-internal.h>
+#include <babeltrace2/trace-ir/trace.h>
+#include <babeltrace2/trace-ir/trace-internal.h>
+#include <babeltrace2/trace-ir/packet-internal.h>
+#include <babeltrace2/trace-ir/attributes-internal.h>
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/compiler-internal.h>
 #include <inttypes.h>
 
 BT_HIDDEN
@@ -56,12 +52,6 @@ void _bt_event_set_is_frozen(const struct bt_event *event, bool is_frozen)
 	BT_LIB_LOGD("Setting event's frozen state: %!+e, is-frozen=%d",
 		event, is_frozen);
 
-	if (event->header_field) {
-		BT_LOGD_STR("Setting event's header field's frozen state.");
-		bt_field_set_is_frozen(
-			event->header_field->field, is_frozen);
-	}
-
 	if (event->common_context_field) {
 		BT_LOGD_STR("Setting event's common context field's frozen state.");
 		bt_field_set_is_frozen(
@@ -85,44 +75,6 @@ void _bt_event_set_is_frozen(const struct bt_event *event, bool is_frozen)
 	bt_packet_set_is_frozen(event->packet, is_frozen);
 }
 
-static
-void recycle_event_header_field(struct bt_field_wrapper *field_wrapper,
-		struct bt_stream_class *stream_class)
-{
-	BT_ASSERT(field_wrapper);
-	BT_LIB_LOGD("Recycling event header field: "
-		"addr=%p, %![sc-]+S, %![field-]+f", field_wrapper,
-		stream_class, field_wrapper->field);
-	bt_object_pool_recycle_object(
-		&stream_class->event_header_field_pool,
-		field_wrapper);
-}
-
-static inline
-struct bt_field_wrapper *create_event_header_field(
-		struct bt_stream_class *stream_class)
-{
-	struct bt_field_wrapper *field_wrapper = NULL;
-
-	field_wrapper = bt_field_wrapper_create(
-		&stream_class->event_header_field_pool,
-		stream_class->event_header_fc);
-	if (!field_wrapper) {
-		goto error;
-	}
-
-	goto end;
-
-error:
-	if (field_wrapper) {
-		recycle_event_header_field(field_wrapper, stream_class);
-		field_wrapper = NULL;
-	}
-
-end:
-	return field_wrapper;
-}
-
 BT_HIDDEN
 struct bt_event *bt_event_new(struct bt_event_class *event_class)
 {
@@ -140,15 +92,6 @@ struct bt_event *bt_event_new(struct bt_event_class *event_class)
 	bt_object_init_unique(&event->base);
 	stream_class = bt_event_class_borrow_stream_class(event_class);
 	BT_ASSERT(stream_class);
-
-	if (stream_class->event_header_fc) {
-		event->header_field = create_event_header_field(stream_class);
-		if (!event->header_field) {
-			BT_LOGE_STR("Cannot create event header field.");
-			goto error;
-		}
-	}
-
 	fc = stream_class->event_common_context_fc;
 	if (fc) {
 		event->common_context_field = bt_field_create(fc);
@@ -176,15 +119,6 @@ struct bt_event *bt_event_new(struct bt_event_class *event_class)
 		}
 	}
 
-	if (stream_class->default_clock_class) {
-		event->default_cv = bt_clock_value_create(
-			stream_class->default_clock_class);
-		if (!event->default_cv) {
-			/* bt_clock_value_create() logs errors */
-			goto error;
-		}
-	}
-
 	goto end;
 
 error:
@@ -221,19 +155,6 @@ const struct bt_stream *bt_event_borrow_stream_const(
 	return bt_event_borrow_stream((void *) event);
 }
 
-struct bt_field *bt_event_borrow_header_field(struct bt_event *event)
-{
-	BT_ASSERT_PRE_NON_NULL(event, "Event");
-	return event->header_field ? event->header_field->field : NULL;
-}
-
-const struct bt_field *bt_event_borrow_header_field_const(
-		const struct bt_event *event)
-{
-	BT_ASSERT_PRE_NON_NULL(event, "Event");
-	return event->header_field ? event->header_field->field : NULL;
-}
-
 struct bt_field *bt_event_borrow_common_context_field(struct bt_event *event)
 {
 	BT_ASSERT_PRE_NON_NULL(event, "Event");
@@ -273,33 +194,12 @@ const struct bt_field *bt_event_borrow_payload_field_const(
 	return event->payload_field;
 }
 
-static
-void release_event_header_field(struct bt_field_wrapper *field_wrapper,
-		struct bt_event *event)
-{
-	if (!event->class) {
-		bt_field_wrapper_destroy(field_wrapper);
-	} else {
-		struct bt_stream_class *stream_class =
-			bt_event_class_borrow_stream_class(event->class);
-
-		BT_ASSERT(stream_class);
-		recycle_event_header_field(field_wrapper, stream_class);
-	}
-}
-
 BT_HIDDEN
 void bt_event_destroy(struct bt_event *event)
 {
 	BT_ASSERT(event);
 	BT_LIB_LOGD("Destroying event: %!+e", event);
 
-	if (event->header_field) {
-		BT_LOGD_STR("Releasing event's header field.");
-		release_event_header_field(event->header_field, event);
-		event->header_field = NULL;
-	}
-
 	if (event->common_context_field) {
 		BT_LOGD_STR("Destroying event's stream event context field.");
 		bt_field_destroy(event->common_context_field);
@@ -320,45 +220,11 @@ void bt_event_destroy(struct bt_event *event)
 
 	BT_LOGD_STR("Putting event's class.");
 	bt_object_put_ref(event->class);
-
-	if (event->default_cv) {
-		bt_clock_value_recycle(event->default_cv);
-		event->default_cv = NULL;
-	}
-
 	BT_LOGD_STR("Putting event's packet.");
 	BT_OBJECT_PUT_REF_AND_RESET(event->packet);
 	g_free(event);
 }
 
-void bt_event_set_default_clock_value(struct bt_event *event,
-		uint64_t value_cycles)
-{
-	struct bt_stream_class *sc;
-
-	BT_ASSERT_PRE_NON_NULL(event, "Event");
-	BT_ASSERT_PRE_EVENT_HOT(event);
-	sc = bt_event_class_borrow_stream_class_inline(event->class);
-	BT_ASSERT(sc);
-	BT_ASSERT_PRE(sc->default_clock_class,
-		"Event's stream class has no default clock class: "
-		"%![ev-]+e, %![sc-]+S", event, sc);
-	BT_ASSERT(event->default_cv);
-	bt_clock_value_set_value_inline(event->default_cv, value_cycles);
-	BT_LIB_LOGV("Set event's default clock value: %![event-]+e, "
-		"value=%" PRIu64, event, value_cycles);
-}
-
-enum bt_clock_value_status bt_event_borrow_default_clock_value_const(
-		const struct bt_event *event,
-		const struct bt_clock_value **clock_value)
-{
-	BT_ASSERT_PRE_NON_NULL(event, "Event");
-	BT_ASSERT_PRE_NON_NULL(clock_value, "Clock value (output)");
-	*clock_value = event->default_cv;
-	return BT_CLOCK_VALUE_STATUS_KNOWN;
-}
-
 struct bt_packet *bt_event_borrow_packet(struct bt_event *event)
 {
 	BT_ASSERT_PRE_NON_NULL(event, "Event");
@@ -370,26 +236,3 @@ const struct bt_packet *bt_event_borrow_packet_const(
 {
 	return bt_event_borrow_packet((void *) event);
 }
-
-int bt_event_move_header_field(struct bt_event *event,
-		struct bt_event_header_field *header_field)
-{
-	struct bt_stream_class *stream_class;
-	struct bt_field_wrapper *field_wrapper = (void *) header_field;
-
-	BT_ASSERT_PRE_NON_NULL(event, "Event");
-	BT_ASSERT_PRE_NON_NULL(field_wrapper, "Header field");
-	BT_ASSERT_PRE_EVENT_HOT(event);
-	stream_class = bt_event_class_borrow_stream_class_inline(event->class);
-	BT_ASSERT_PRE(stream_class->event_header_fc,
-		"Stream class has no event header field class: %!+S",
-		stream_class);
-
-	/* Recycle current header field: always exists */
-	BT_ASSERT(event->header_field);
-	recycle_event_header_field(event->header_field, stream_class);
-
-	/* Move new field */
-	event->header_field = field_wrapper;
-	return 0;
-}