X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Ftrace-ir%2Fevent-internal.h;h=cfc30ee1b48fa46c3110f361e2587cff06425378;hb=83ebb7f1751a20c7ba771442487f863331c754ef;hp=11676fedd1b4ab27d8c9352338a36fa8f6fcff2a;hpb=e5be10efe4d5543ba697c7e607ca0a5c33fa3ccb;p=babeltrace.git

diff --git a/include/babeltrace/trace-ir/event-internal.h b/include/babeltrace/trace-ir/event-internal.h
index 11676fed..cfc30ee1 100644
--- a/include/babeltrace/trace-ir/event-internal.h
+++ b/include/babeltrace/trace-ir/event-internal.h
@@ -2,12 +2,9 @@
 #define BABELTRACE_TRACE_IR_EVENT_INTERNAL_H
 
 /*
- * Babeltrace - Trace IR: Event internal
- *
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -34,15 +31,15 @@
 
 #include <babeltrace/assert-pre-internal.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/values.h>
-#include <babeltrace/trace-ir/clock-value-internal.h>
+#include <babeltrace/value.h>
+#include <babeltrace/trace-ir/clock-snapshot-internal.h>
 #include <babeltrace/trace-ir/stream-class.h>
 #include <babeltrace/trace-ir/stream.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/fields.h>
-#include <babeltrace/trace-ir/fields-internal.h>
+#include <babeltrace/trace-ir/field.h>
+#include <babeltrace/trace-ir/field-internal.h>
 #include <babeltrace/trace-ir/event-class-internal.h>
 #include <babeltrace/trace-ir/field-wrapper-internal.h>
 #include <babeltrace/object-internal.h>
@@ -50,17 +47,22 @@
 #include <glib.h>
 
 #define BT_ASSERT_PRE_EVENT_HOT(_event) \
-	BT_ASSERT_PRE_HOT(((struct bt_event *) (_event)), "Event", ": %!+e", (_event))
+	BT_ASSERT_PRE_HOT(((const struct bt_event *) (_event)), 	\
+		"Event", ": %!+e", (_event))
 
 struct bt_event {
 	struct bt_object base;
+
+	/* Owned by this */
 	struct bt_event_class *class;
+
+	/* Owned by this */
 	struct bt_packet *packet;
-	struct bt_field_wrapper *header_field;
+
 	struct bt_field *common_context_field;
 	struct bt_field *specific_context_field;
 	struct bt_field *payload_field;
-	struct bt_clock_value *default_cv;
+	struct bt_clock_snapshot *default_cs;
 	bool frozen;
 };
 
@@ -71,7 +73,7 @@ BT_HIDDEN
 struct bt_event *bt_event_new(struct bt_event_class *event_class);
 
 BT_HIDDEN
-void _bt_event_set_is_frozen(struct bt_event *event, bool is_frozen);
+void _bt_event_set_is_frozen(const struct bt_event *event, bool is_frozen);
 
 #ifdef BT_DEV_MODE
 # define bt_event_set_is_frozen		_bt_event_set_is_frozen
@@ -85,13 +87,6 @@ void _bt_event_reset_dev_mode(struct bt_event *event)
 {
 	BT_ASSERT(event);
 
-	if (event->header_field) {
-		bt_field_set_is_frozen(
-			event->header_field->field, false);
-		bt_field_reset(
-			event->header_field->field);
-	}
-
 	if (event->common_context_field) {
 		bt_field_set_is_frozen(
 			event->common_context_field, false);
@@ -125,8 +120,8 @@ void bt_event_reset(struct bt_event *event)
 	BT_LIB_LOGD("Resetting event: %!+e", event);
 	bt_event_set_is_frozen(event, false);
 
-	if (event->default_cv) {
-		bt_clock_value_reset(event->default_cv);
+	if (event->default_cs) {
+		bt_clock_snapshot_reset(event->default_cs);
 	}
 
 	bt_object_put_no_null_check(&event->packet->base);