X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fctf-ir%2Fevent.c;h=fd4563744e534157131df8d2a727a1dfe0fc2f2e;hb=2a3ced3c38855ea18eb9b29e58563a7301b98216;hp=6dc7ad0754c4dd0da7bd7d3992983eb8a803f766;hpb=4a2fffdb3c120ac5f16d4308b2da375fbe9def20;p=babeltrace.git

diff --git a/lib/ctf-ir/event.c b/lib/ctf-ir/event.c
index 6dc7ad07..fd456374 100644
--- a/lib/ctf-ir/event.c
+++ b/lib/ctf-ir/event.c
@@ -48,6 +48,7 @@
 #include <babeltrace/ctf-ir/packet-internal.h>
 #include <babeltrace/ctf-ir/utils.h>
 #include <babeltrace/ctf-writer/serialize-internal.h>
+#include <babeltrace/ctf-writer/clock-internal.h>
 #include <babeltrace/ref.h>
 #include <babeltrace/ctf-ir/attributes-internal.h>
 #include <babeltrace/compiler-internal.h>
@@ -78,6 +79,7 @@ struct bt_event *bt_event_create(struct bt_event_class *event_class)
 	struct bt_value *environment = NULL;
 	struct bt_validation_output validation_output = { 0 };
 	int trace_valid = 0;
+	struct bt_clock_class *expected_clock_class = NULL;
 
 	BT_LOGD("Creating event object: event-class-addr=%p, "
 		"event-class-name=\"%s\", event-class-id=%" PRId64,
@@ -103,6 +105,40 @@ struct bt_event *bt_event_create(struct bt_event_class *event_class)
 	/* The event class was frozen when added to its stream class */
 	assert(event_class->frozen);
 
+	if (!stream_class->frozen) {
+		if (stream_class->clock) {
+			expected_clock_class =
+				bt_get(stream_class->clock->clock_class);
+		}
+
+		/*
+		 * Because this function freezes the stream class,
+		 * validate that this stream class contains at most a
+		 * single clock class so that we set its expected clock
+		 * class for future checks.
+		 */
+		ret = bt_stream_class_validate_single_clock_class(
+			stream_class, &expected_clock_class);
+		if (ret) {
+			BT_LOGW("Event class's stream class or one of its event "
+				"classes contains a field type which is not "
+				"recursively mapped to the expected "
+				"clock class: "
+				"stream-class-addr=%p, "
+				"stream-class-id=%" PRId64 ", "
+				"stream-class-name=\"%s\", "
+				"expected-clock-class-addr=%p, "
+				"expected-clock-class-name=\"%s\"",
+				stream_class, bt_stream_class_get_id(stream_class),
+				bt_stream_class_get_name(stream_class),
+				expected_clock_class,
+				expected_clock_class ?
+					bt_clock_class_get_name(expected_clock_class) :
+					NULL);
+			goto error;
+		}
+	}
+
 	/* Validate the trace (if any), the stream class, and the event class */
 	trace = bt_stream_class_get_trace(stream_class);
 	if (trace) {
@@ -242,6 +278,14 @@ struct bt_event *bt_event_create(struct bt_event_class *event_class)
 	 */
 	bt_stream_class_freeze(stream_class);
 
+	/*
+	 * It is safe to set the stream class's unique clock class
+	 * now because the stream class is frozen.
+	 */
+	if (expected_clock_class) {
+		BT_MOVE(stream_class->clock_class, expected_clock_class);
+	}
+
 	/*
 	 * Mark stream class, and event class as valid since
 	 * they're all frozen now.
@@ -267,6 +311,7 @@ error:
 	BT_PUT(stream_event_context);
 	BT_PUT(event_context);
 	BT_PUT(event_payload);
+	bt_put(expected_clock_class);
 	assert(!packet_header_type);
 	assert(!packet_context_type);
 	assert(!event_header_type);