X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fevent.c;h=2c1dad47500b1480569369ab581d776bb9933ee1;hb=c5a9aa19ea52f76f02747d9688d5d044b4a1b545;hp=caea354adcefb5a5c62e68a7f5ef31e951ac5bb1;hpb=d2dc44b6775655cf77a13a3901898c3f1ca26baa;p=babeltrace.git

diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c
index caea354a..2c1dad47 100644
--- a/formats/ctf/ir/event.c
+++ b/formats/ctf/ir/event.c
@@ -33,19 +33,23 @@
 #include <babeltrace/ctf-ir/event-types-internal.h>
 #include <babeltrace/ctf-ir/event-internal.h>
 #include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-writer/writer-internal.h>
+#include <babeltrace/ctf-ir/stream-class-internal.h>
+#include <babeltrace/ctf-ir/trace-internal.h>
+#include <babeltrace/ctf-ir/utils.h>
 #include <babeltrace/compiler.h>
 
 static
 void bt_ctf_event_class_destroy(struct bt_ctf_ref *ref);
 static
 void bt_ctf_event_destroy(struct bt_ctf_ref *ref);
+static
+int set_integer_field_value(struct bt_ctf_field *field, uint64_t value);
 
 struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name)
 {
 	struct bt_ctf_event_class *event_class = NULL;
 
-	if (validate_identifier(name)) {
+	if (bt_ctf_validate_identifier(name)) {
 		goto end;
 	}
 
@@ -55,6 +59,13 @@ struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name)
 	}
 
 	bt_ctf_ref_init(&event_class->ref_count);
+	event_class->fields = bt_ctf_field_type_structure_create();
+	if (!event_class->fields) {
+		bt_ctf_event_class_put(event_class);
+		event_class = NULL;
+		goto end;
+	}
+
 	event_class->name = g_quark_from_string(name);
 end:
 	return event_class;
@@ -127,24 +138,54 @@ end:
 	return stream_class;
 }
 
+struct bt_ctf_field_type *bt_ctf_event_class_get_payload_type(
+		struct bt_ctf_event_class *event_class)
+{
+	struct bt_ctf_field_type *payload = NULL;
+
+	if (!event_class) {
+		goto end;
+	}
+
+	bt_ctf_field_type_get(event_class->fields);
+	payload = event_class->fields;
+end:
+	return payload;
+}
+
+int bt_ctf_event_class_set_payload_type(struct bt_ctf_event_class *event_class,
+		struct bt_ctf_field_type *payload)
+{
+	int ret = 0;
+
+	if (!event_class || !payload) {
+		ret = -1;
+		goto end;
+	}
+
+	bt_ctf_field_type_get(payload);
+	bt_ctf_field_type_put(event_class->fields);
+	event_class->fields = payload;
+end:
+	return ret;
+}
+
 int bt_ctf_event_class_add_field(struct bt_ctf_event_class *event_class,
 		struct bt_ctf_field_type *type,
 		const char *name)
 {
 	int ret = 0;
 
-	if (!event_class || !type || validate_identifier(name) ||
+	if (!event_class || !type || bt_ctf_validate_identifier(name) ||
 		event_class->frozen) {
 		ret = -1;
 		goto end;
 	}
 
-	if (!event_class->fields) {
-		event_class->fields = bt_ctf_field_type_structure_create();
-		if (!event_class->fields) {
-			ret = -1;
-			goto end;
-		}
+	if (bt_ctf_field_type_get_type_id(event_class->fields) !=
+		CTF_TYPE_STRUCT) {
+		ret = -1;
+		goto end;
 	}
 
 	ret = bt_ctf_field_type_structure_add_field(event_class->fields,
@@ -153,16 +194,22 @@ end:
 	return ret;
 }
 
-int64_t bt_ctf_event_class_get_field_count(
+int bt_ctf_event_class_get_field_count(
 		struct bt_ctf_event_class *event_class)
 {
-	int64_t ret;
+	int ret;
 
 	if (!event_class) {
 		ret = -1;
 		goto end;
 	}
 
+	if (bt_ctf_field_type_get_type_id(event_class->fields) !=
+		CTF_TYPE_STRUCT) {
+		ret = -1;
+		goto end;
+	}
+
 	ret = bt_ctf_field_type_structure_get_field_count(event_class->fields);
 end:
 	return ret;
@@ -170,11 +217,17 @@ end:
 
 int bt_ctf_event_class_get_field(struct bt_ctf_event_class *event_class,
 		const char **field_name, struct bt_ctf_field_type **field_type,
-		size_t index)
+		int index)
 {
 	int ret;
 
-	if (!event_class) {
+	if (!event_class || index < 0) {
+		ret = -1;
+		goto end;
+	}
+
+	if (bt_ctf_field_type_get_type_id(event_class->fields) !=
+		CTF_TYPE_STRUCT) {
 		ret = -1;
 		goto end;
 	}
@@ -195,6 +248,11 @@ struct bt_ctf_field_type *bt_ctf_event_class_get_field_by_name(
 		goto end;
 	}
 
+	if (bt_ctf_field_type_get_type_id(event_class->fields) !=
+		CTF_TYPE_STRUCT) {
+		goto end;
+	}
+
 	name_quark = g_quark_try_string(name);
 	if (!name_quark) {
 		goto end;
@@ -210,6 +268,45 @@ end:
 	return field_type;
 }
 
+struct bt_ctf_field_type *bt_ctf_event_class_get_context_type(
+		struct bt_ctf_event_class *event_class)
+{
+	struct bt_ctf_field_type *context_type = NULL;
+
+	if (!event_class || !event_class->context) {
+		goto end;
+	}
+
+	bt_ctf_field_type_get(event_class->context);
+	context_type = event_class->context;
+end:
+	return context_type;
+}
+
+int bt_ctf_event_class_set_context_type(
+		struct bt_ctf_event_class *event_class,
+		struct bt_ctf_field_type *context)
+{
+	int ret = 0;
+
+	if (!event_class || !context || event_class->frozen) {
+		ret = -1;
+		goto end;
+	}
+
+	if (bt_ctf_field_type_get_type_id(context) != CTF_TYPE_STRUCT) {
+		ret = -1;
+		goto end;
+	}
+
+	bt_ctf_field_type_get(context);
+	bt_ctf_field_type_put(event_class->context);
+	event_class->context = context;
+end:
+	return ret;
+
+}
+
 void bt_ctf_event_class_get(struct bt_ctf_event_class *event_class)
 {
 	if (!event_class) {
@@ -245,10 +342,45 @@ struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class)
 	bt_ctf_event_class_get(event_class);
 	bt_ctf_event_class_freeze(event_class);
 	event->event_class = event_class;
-	event->context_payload = bt_ctf_field_create(event_class->context);
+
+	/*
+	 * The event class does not keep ownership of the stream class to
+	 * which it as been added. Therefore, it can't assume it has been
+	 * set. However, we disallow the creation of an event if its
+	 * associated stream class has been reclaimed.
+	 */
+	if (!event_class->stream_class) {
+		goto error_destroy;
+	}
+	assert(event_class->stream_class->event_header_type);
+
+	event->event_header = bt_ctf_field_create(
+		event_class->stream_class->event_header_type);
+	if (!event->event_header) {
+		goto error_destroy;
+	}
+	if (event_class->context) {
+		event->context_payload = bt_ctf_field_create(
+			event_class->context);
+		if (!event->context_payload) {
+			goto error_destroy;
+		}
+	}
 	event->fields_payload = bt_ctf_field_create(event_class->fields);
+	if (!event->fields_payload) {
+		goto error_destroy;
+	}
+
+	/*
+	 * Freeze the stream class since the event header must not be changed
+	 * anymore.
+	 */
+	bt_ctf_stream_class_freeze(event_class->stream_class);
 end:
 	return event;
+error_destroy:
+	bt_ctf_event_destroy(&event->ref_count);
+	return NULL;
 }
 
 struct bt_ctf_event_class *bt_ctf_event_get_class(struct bt_ctf_event *event)
@@ -300,17 +432,32 @@ end:
 
 int bt_ctf_event_set_payload(struct bt_ctf_event *event,
 		const char *name,
-		struct bt_ctf_field *value)
+		struct bt_ctf_field *payload)
 {
 	int ret = 0;
 
-	if (!event || !value || validate_identifier(name)) {
+	if (!event || !payload) {
 		ret = -1;
 		goto end;
 	}
 
-	ret = bt_ctf_field_structure_set_field(event->fields_payload,
-		name, value);
+	if (name) {
+		ret = bt_ctf_field_structure_set_field(event->fields_payload,
+			name, payload);
+	} else {
+		struct bt_ctf_field_type *payload_type;
+
+		payload_type = bt_ctf_field_get_type(payload);
+		if (payload_type == event->event_class->fields) {
+			bt_ctf_field_put(event->fields_payload);
+			bt_ctf_field_get(payload);
+			event->fields_payload = payload;
+		} else {
+			ret = -1;
+		}
+
+		bt_ctf_field_type_put(payload_type);
+	}
 end:
 	return ret;
 }
@@ -321,21 +468,27 @@ struct bt_ctf_field *bt_ctf_event_get_payload(struct bt_ctf_event *event,
 {
 	struct bt_ctf_field *field = NULL;
 
-	if (!event || !name) {
+	if (!event) {
 		goto end;
 	}
 
-	field = bt_ctf_field_structure_get_field(event->fields_payload, name);
+	if (name) {
+		field = bt_ctf_field_structure_get_field(event->fields_payload,
+			name);
+	} else {
+		field = event->fields_payload;
+		bt_ctf_field_get(field);
+	}
 end:
 	return field;
 }
 
 struct bt_ctf_field *bt_ctf_event_get_payload_by_index(
-		struct bt_ctf_event *event, size_t index)
+		struct bt_ctf_event *event, int index)
 {
 	struct bt_ctf_field *field = NULL;
 
-	if (!event) {
+	if (!event || index < 0) {
 		goto end;
 	}
 
@@ -345,6 +498,100 @@ end:
 	return field;
 }
 
+struct bt_ctf_field *bt_ctf_event_get_event_header(
+		struct bt_ctf_event *event)
+{
+	struct bt_ctf_field *header = NULL;
+
+	if (!event || !event->event_header) {
+		goto end;
+	}
+
+	header = event->event_header;
+	bt_ctf_field_get(header);
+end:
+	return header;
+}
+
+int bt_ctf_event_set_event_header(struct bt_ctf_event *event,
+		struct bt_ctf_field *header)
+{
+	int ret = 0;
+	struct bt_ctf_field_type *field_type = NULL;
+
+	if (!event || !header) {
+		ret = -1;
+		goto end;
+	}
+
+	/* Could be NULL since an event class doesn't own a stream class */
+	if (!event->event_class->stream_class) {
+		ret = -1;
+		goto end;
+	}
+
+	/*
+	 * Ensure the provided header's type matches the one registered to the
+	 * stream class.
+	 */
+	field_type = bt_ctf_field_get_type(header);
+	if (field_type != event->event_class->stream_class->event_header_type) {
+		ret = -1;
+		goto end;
+	}
+
+	bt_ctf_field_get(header);
+	bt_ctf_field_put(event->event_header);
+	event->event_header = header;
+end:
+	if (field_type) {
+		bt_ctf_field_type_put(field_type);
+	}
+	return ret;
+}
+
+struct bt_ctf_field *bt_ctf_event_get_event_context(
+		struct bt_ctf_event *event)
+{
+	struct bt_ctf_field *context = NULL;
+
+	if (!event || !event->context_payload) {
+		goto end;
+	}
+
+	context = event->context_payload;
+	bt_ctf_field_get(context);
+end:
+	return context;
+}
+
+int bt_ctf_event_set_event_context(struct bt_ctf_event *event,
+		struct bt_ctf_field *context)
+{
+	int ret = 0;
+	struct bt_ctf_field_type *field_type = NULL;
+
+	if (!event || !context) {
+		ret = -1;
+		goto end;
+	}
+
+	field_type = bt_ctf_field_get_type(context);
+	if (field_type != event->event_class->context) {
+		ret = -1;
+		goto end;
+	}
+
+	bt_ctf_field_get(context);
+	bt_ctf_field_put(event->context_payload);
+	event->context_payload = context;
+end:
+	if (field_type) {
+		bt_ctf_field_type_put(field_type);
+	}
+	return ret;
+}
+
 void bt_ctf_event_get(struct bt_ctf_event *event)
 {
 	if (!event) {
@@ -377,8 +624,12 @@ void bt_ctf_event_class_destroy(struct bt_ctf_ref *ref)
 	 * bt_ctf_event_class_set_stream_class for explanation.
 	 */
 	event_class = container_of(ref, struct bt_ctf_event_class, ref_count);
-	bt_ctf_field_type_put(event_class->context);
-	bt_ctf_field_type_put(event_class->fields);
+	if (event_class->context) {
+		bt_ctf_field_type_put(event_class->context);
+	}
+	if (event_class->fields) {
+		bt_ctf_field_type_put(event_class->fields);
+	}
 	g_free(event_class);
 }
 
@@ -393,12 +644,64 @@ void bt_ctf_event_destroy(struct bt_ctf_ref *ref)
 
 	event = container_of(ref, struct bt_ctf_event,
 		ref_count);
-	bt_ctf_event_class_put(event->event_class);
-	bt_ctf_field_put(event->context_payload);
-	bt_ctf_field_put(event->fields_payload);
+	if (event->event_class) {
+		bt_ctf_event_class_put(event->event_class);
+	}
+	if (event->event_header) {
+		bt_ctf_field_put(event->event_header);
+	}
+	if (event->context_payload) {
+		bt_ctf_field_put(event->context_payload);
+	}
+	if (event->fields_payload) {
+		bt_ctf_field_put(event->fields_payload);
+	}
 	g_free(event);
 }
 
+static
+int set_integer_field_value(struct bt_ctf_field* field, uint64_t value)
+{
+	int ret = 0;
+	struct bt_ctf_field_type *field_type = NULL;
+
+	if (!field) {
+		ret = -1;
+		goto end;
+	}
+
+	if (!bt_ctf_field_validate(field)) {
+		/* Payload already set, skip! (not an error) */
+		goto end;
+	}
+
+	field_type = bt_ctf_field_get_type(field);
+	assert(field_type);
+
+	if (bt_ctf_field_type_get_type_id(field_type) != CTF_TYPE_INTEGER) {
+		/* Not an integer and the value is unset, error. */
+		ret = -1;
+		goto end;
+	}
+
+	if (bt_ctf_field_type_integer_get_signed(field_type)) {
+		ret = bt_ctf_field_signed_integer_set_value(field, (int64_t) value);
+		if (ret) {
+			/* Value is out of range, error. */
+			goto end;
+		}
+	} else {
+		ret = bt_ctf_field_unsigned_integer_set_value(field, value);
+		if (ret) {
+			/* Value is out of range, error. */
+			goto end;
+		}
+	}
+end:
+	bt_ctf_field_type_put(field_type);
+	return ret;
+}
+
 BT_HIDDEN
 void bt_ctf_event_class_freeze(struct bt_ctf_event_class *event_class)
 {
@@ -455,7 +758,8 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
 
 	context->current_indentation_level = 1;
 	g_string_assign(context->field_name, "");
-	g_string_append_printf(context->string, "event {\n\tname = \"%s\";\n\tid = %u;\n\tstream_id = %" PRId64 ";\n",
+	g_string_append_printf(context->string,
+		"event {\n\tname = \"%s\";\n\tid = %u;\n\tstream_id = %" PRId64 ";\n",
 		g_quark_to_string(event_class->name),
 		event_class->id,
 		stream_id);
@@ -485,6 +789,20 @@ end:
 	return ret;
 }
 
+void bt_ctf_event_class_set_native_byte_order(
+		struct bt_ctf_event_class *event_class,
+		int byte_order)
+{
+	if (!event_class) {
+		return;
+	}
+
+	bt_ctf_field_type_set_native_byte_order(event_class->context,
+		byte_order);
+	bt_ctf_field_type_set_native_byte_order(event_class->fields,
+		byte_order);
+}
+
 BT_HIDDEN
 int bt_ctf_event_validate(struct bt_ctf_event *event)
 {
@@ -492,6 +810,11 @@ int bt_ctf_event_validate(struct bt_ctf_event *event)
 	int ret;
 
 	assert(event);
+	ret = bt_ctf_field_validate(event->event_header);
+	if (ret) {
+		goto end;
+	}
+
 	ret = bt_ctf_field_validate(event->fields_payload);
 	if (ret) {
 		goto end;
@@ -530,25 +853,58 @@ end:
 }
 
 BT_HIDDEN
-int bt_ctf_event_set_timestamp(struct bt_ctf_event *event,
-		uint64_t timestamp)
+int bt_ctf_event_populate_event_header(struct bt_ctf_event *event)
 {
 	int ret = 0;
+	struct bt_ctf_field *id_field = NULL, *timestamp_field = NULL;
 
-	assert(event);
-	if (event->timestamp) {
+	if (!event) {
 		ret = -1;
 		goto end;
 	}
 
-	event->timestamp = timestamp;
+	id_field = bt_ctf_field_structure_get_field(event->event_header, "id");
+	if (id_field) {
+		ret = set_integer_field_value(id_field,
+			(uint64_t) event->event_class->id);
+		if (ret) {
+			goto end;
+		}
+	}
+
+	timestamp_field = bt_ctf_field_structure_get_field(event->event_header,
+		"timestamp");
+	if (timestamp_field) {
+		struct bt_ctf_field_type *timestamp_field_type =
+			bt_ctf_field_get_type(timestamp_field);
+		struct bt_ctf_clock *mapped_clock;
+
+		assert(timestamp_field_type);
+		mapped_clock = bt_ctf_field_type_integer_get_mapped_clock(
+			timestamp_field_type);
+		bt_ctf_field_type_put(timestamp_field_type);
+		if (mapped_clock) {
+			uint64_t timestamp = bt_ctf_clock_get_time(
+				mapped_clock);
+
+			bt_ctf_clock_put(mapped_clock);
+			if (timestamp == (uint64_t) -1ULL) {
+				goto end;
+			}
+
+			ret = set_integer_field_value(timestamp_field,
+				timestamp);
+			if (ret) {
+				goto end;
+			}
+		}
+	}
 end:
+	if (id_field) {
+		bt_ctf_field_put(id_field);
+	}
+	if (timestamp_field) {
+		bt_ctf_field_put(timestamp_field);
+	}
 	return ret;
 }
-
-BT_HIDDEN
-uint64_t bt_ctf_event_get_timestamp(struct bt_ctf_event *event)
-{
-	assert(event);
-	return event->timestamp;
-}