X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fevent.c;h=226251f7bbd84adc7793806f50c382964827e099;hb=83509119a945fc77faff869daaf48627e1c4b3fa;hp=543ecb7f9dc3528e6a7d4d9d66afb5cc13ec298b;hpb=9ea90c02935714561ae303f67c8f3af6acfaa8b2;p=babeltrace.git

diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c
index 543ecb7f..226251f7 100644
--- a/formats/ctf/ir/event.c
+++ b/formats/ctf/ir/event.c
@@ -36,19 +36,21 @@
 #include <babeltrace/ctf-ir/stream-class-internal.h>
 #include <babeltrace/ctf-ir/trace-internal.h>
 #include <babeltrace/ctf-ir/utils.h>
+#include <babeltrace/ref.h>
+#include <babeltrace/ctf-ir/attributes-internal.h>
 #include <babeltrace/compiler.h>
 
 static
-void bt_ctf_event_class_destroy(struct bt_ctf_ref *ref);
+void bt_ctf_event_class_destroy(struct bt_object *obj);
 static
-void bt_ctf_event_destroy(struct bt_ctf_ref *ref);
+void bt_ctf_event_destroy(struct bt_object *obj);
 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)
 {
 	int ret;
-	struct bt_object *obj = NULL;
+	struct bt_value *obj = NULL;
 	struct bt_ctf_event_class *event_class = NULL;
 
 	if (bt_ctf_validate_identifier(name)) {
@@ -60,7 +62,7 @@ struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name)
 		goto error;
 	}
 
-	bt_ctf_ref_init(&event_class->ref_count);
+	bt_object_init(event_class, bt_ctf_event_class_destroy);
 	event_class->fields = bt_ctf_field_type_structure_create();
 	if (!event_class->fields) {
 		goto error;
@@ -71,7 +73,7 @@ struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name)
 		goto error;
 	}
 
-	obj = bt_object_integer_create_init(-1);
+	obj = bt_value_integer_create_init(-1);
 	if (!obj) {
 		goto error;
 	}
@@ -82,9 +84,9 @@ struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name)
 		goto error;
 	}
 
-	BT_OBJECT_PUT(obj);
+	BT_PUT(obj);
 
-	obj = bt_object_string_create_init(name);
+	obj = bt_value_string_create_init(name);
 	if (!obj) {
 		goto error;
 	}
@@ -95,23 +97,19 @@ struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name)
 		goto error;
 	}
 
-	BT_OBJECT_PUT(obj);
+	BT_PUT(obj);
 
 	return event_class;
 
 error:
-	if (event_class) {
-		bt_ctf_event_class_put(event_class);
-	}
-
-	BT_OBJECT_PUT(obj);
-
-	return NULL;
+        BT_PUT(event_class);
+	BT_PUT(obj);
+	return event_class;
 }
 
 const char *bt_ctf_event_class_get_name(struct bt_ctf_event_class *event_class)
 {
-	struct bt_object *obj = NULL;
+	struct bt_value *obj = NULL;
 	const char *name = NULL;
 
 	if (!event_class) {
@@ -124,19 +122,18 @@ const char *bt_ctf_event_class_get_name(struct bt_ctf_event_class *event_class)
 		goto end;
 	}
 
-	if (bt_object_string_get(obj, &name)) {
+	if (bt_value_string_get(obj, &name)) {
 		name = NULL;
 	}
 
 end:
-	BT_OBJECT_PUT(obj);
-
+	BT_PUT(obj);
 	return name;
 }
 
 int64_t bt_ctf_event_class_get_id(struct bt_ctf_event_class *event_class)
 {
-	struct bt_object *obj = NULL;
+	struct bt_value *obj = NULL;
 	int64_t ret = 0;
 
 	if (!event_class) {
@@ -150,7 +147,7 @@ int64_t bt_ctf_event_class_get_id(struct bt_ctf_event_class *event_class)
 		goto end;
 	}
 
-	if (bt_object_integer_get(obj, &ret)) {
+	if (bt_value_integer_get(obj, &ret)) {
 		ret = -1;
 	}
 
@@ -161,8 +158,7 @@ int64_t bt_ctf_event_class_get_id(struct bt_ctf_event_class *event_class)
 	}
 
 end:
-	BT_OBJECT_PUT(obj);
-
+	BT_PUT(obj);
 	return ret;
 }
 
@@ -170,7 +166,7 @@ int bt_ctf_event_class_set_id(struct bt_ctf_event_class *event_class,
 		uint32_t id)
 {
 	int ret = 0;
-	struct bt_object *obj = NULL;
+	struct bt_value *obj = NULL;
 
 	if (!event_class) {
 		ret = -1;
@@ -192,20 +188,19 @@ int bt_ctf_event_class_set_id(struct bt_ctf_event_class *event_class,
 		goto end;
 	}
 
-	if (bt_object_integer_set(obj, id)) {
+	if (bt_value_integer_set(obj, id)) {
 		ret = -1;
 		goto end;
 	}
 
 end:
-	BT_OBJECT_PUT(obj);
-
+	BT_PUT(obj);
 	return ret;
 }
 
 int bt_ctf_event_class_set_attribute(
 		struct bt_ctf_event_class *event_class, const char *name,
-		struct bt_object *value)
+		struct bt_value *value)
 {
 	int ret = 0;
 
@@ -215,12 +210,12 @@ int bt_ctf_event_class_set_attribute(
 	}
 
 	if (!strcmp(name, "id") || !strcmp(name, "loglevel")) {
-		if (!bt_object_is_integer(value)) {
+		if (!bt_value_is_integer(value)) {
 			ret = -1;
 			goto end;
 		}
 	} else if (!strcmp(name, "name") || !strcmp(name, "model.emf.uri")) {
-		if (!bt_object_is_string(value)) {
+		if (!bt_value_is_string(value)) {
 			ret = -1;
 			goto end;
 		}
@@ -234,7 +229,7 @@ int bt_ctf_event_class_set_attribute(
 	if (!strcmp(name, "id")) {
 		int64_t val;
 
-		ret = bt_object_integer_get(value, &val);
+		ret = bt_value_integer_get(value, &val);
 
 		if (ret) {
 			goto end;
@@ -286,11 +281,11 @@ end:
 	return ret;
 }
 
-struct bt_object *
+struct bt_value *
 bt_ctf_event_class_get_attribute_value(struct bt_ctf_event_class *event_class,
 		int index)
 {
-	struct bt_object *ret;
+	struct bt_value *ret;
 
 	if (!event_class) {
 		ret = NULL;
@@ -303,11 +298,11 @@ end:
 	return ret;
 }
 
-struct bt_object *
+struct bt_value *
 bt_ctf_event_class_get_attribute_value_by_name(
 		struct bt_ctf_event_class *event_class, const char *name)
 {
-	struct bt_object *ret;
+	struct bt_value *ret;
 
 	if (!event_class || !name) {
 		ret = NULL;
@@ -332,7 +327,7 @@ struct bt_ctf_stream_class *bt_ctf_event_class_get_stream_class(
 	}
 
 	stream_class = event_class->stream_class;
-	bt_ctf_stream_class_get(stream_class);
+	bt_get(stream_class);
 end:
 	return stream_class;
 }
@@ -346,7 +341,7 @@ struct bt_ctf_field_type *bt_ctf_event_class_get_payload_type(
 		goto end;
 	}
 
-	bt_ctf_field_type_get(event_class->fields);
+	bt_get(event_class->fields);
 	payload = event_class->fields;
 end:
 	return payload;
@@ -363,8 +358,8 @@ int bt_ctf_event_class_set_payload_type(struct bt_ctf_event_class *event_class,
 		goto end;
 	}
 
-	bt_ctf_field_type_get(payload);
-	bt_ctf_field_type_put(event_class->fields);
+	bt_get(payload);
+	bt_put(event_class->fields);
 	event_class->fields = payload;
 end:
 	return ret;
@@ -477,7 +472,7 @@ struct bt_ctf_field_type *bt_ctf_event_class_get_context_type(
 		goto end;
 	}
 
-	bt_ctf_field_type_get(event_class->context);
+	bt_get(event_class->context);
 	context_type = event_class->context;
 end:
 	return context_type;
@@ -499,8 +494,8 @@ int bt_ctf_event_class_set_context_type(
 		goto end;
 	}
 
-	bt_ctf_field_type_get(context);
-	bt_ctf_field_type_put(event_class->context);
+	bt_get(context);
+	bt_put(event_class->context);
 	event_class->context = context;
 end:
 	return ret;
@@ -509,26 +504,38 @@ end:
 
 void bt_ctf_event_class_get(struct bt_ctf_event_class *event_class)
 {
-	if (!event_class) {
-		return;
-	}
-
-	bt_ctf_ref_get(&event_class->ref_count);
+	bt_get(event_class);
 }
 
 void bt_ctf_event_class_put(struct bt_ctf_event_class *event_class)
 {
-	if (!event_class) {
-		return;
+	bt_put(event_class);
+}
+
+BT_HIDDEN
+int bt_ctf_event_class_set_stream_id(struct bt_ctf_event_class *event_class,
+		uint32_t stream_id)
+{
+	int ret = 0;
+	struct bt_value *obj;
+
+	obj = bt_value_integer_create_init(stream_id);
+
+	if (!obj) {
+		ret = -1;
+		goto end;
 	}
 
-	bt_ctf_ref_put(&event_class->ref_count, bt_ctf_event_class_destroy);
+	ret = bt_ctf_attributes_set_field_value(event_class->attributes,
+		"stream_id", obj);
+
+end:
+	BT_PUT(obj);
+	return ret;
 }
 
 struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class)
 {
-	int ret;
-	struct bt_object *obj = NULL;
 	struct bt_ctf_event *event = NULL;
 
 	if (!event_class) {
@@ -545,46 +552,31 @@ struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class)
 		goto end;
 	}
 	assert(event_class->stream_class->event_header_type);
-
-	/* set "stream_id" attribute now that we know its value */
-	obj = bt_object_integer_create_init(event_class->stream_class->id);
-	if (!obj) {
-		goto end;
-	}
-
-	ret = bt_ctf_attributes_set_field_value(event_class->attributes,
-		"stream_id", obj);
-	BT_OBJECT_PUT(obj);
-
-	if (ret) {
-		goto end;
-	}
-
 	event = g_new0(struct bt_ctf_event, 1);
 	if (!event) {
 		goto end;
 	}
 
-	bt_ctf_ref_init(&event->ref_count);
-	bt_ctf_event_class_get(event_class);
+	bt_object_init(event, bt_ctf_event_destroy);
+	bt_get(event_class);
 	bt_ctf_event_class_freeze(event_class);
 	event->event_class = event_class;
 
 	event->event_header = bt_ctf_field_create(
 		event_class->stream_class->event_header_type);
 	if (!event->event_header) {
-		goto error_destroy;
+		goto error;
 	}
 	if (event_class->context) {
 		event->context_payload = bt_ctf_field_create(
 			event_class->context);
 		if (!event->context_payload) {
-			goto error_destroy;
+			goto error;
 		}
 	}
 	event->fields_payload = bt_ctf_field_create(event_class->fields);
 	if (!event->fields_payload) {
-		goto error_destroy;
+		goto error;
 	}
 
 	/*
@@ -594,12 +586,9 @@ struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class)
 	bt_ctf_stream_class_freeze(event_class->stream_class);
 end:
 	return event;
-error_destroy:
-	if (event) {
-		bt_ctf_event_destroy(&event->ref_count);
-	}
-
-	return NULL;
+error:
+	BT_PUT(event);
+	return event;
 }
 
 struct bt_ctf_event_class *bt_ctf_event_get_class(struct bt_ctf_event *event)
@@ -611,7 +600,7 @@ struct bt_ctf_event_class *bt_ctf_event_get_class(struct bt_ctf_event *event)
 	}
 
 	event_class = event->event_class;
-	bt_ctf_event_class_get(event_class);
+	bt_get(event_class);
 end:
 	return event_class;
 }
@@ -625,9 +614,7 @@ struct bt_ctf_stream *bt_ctf_event_get_stream(struct bt_ctf_event *event)
 	}
 
 	stream = event->stream;
-	if (stream) {
-		bt_ctf_stream_get(stream);
-	}
+	bt_get(stream);
 end:
 	return stream;
 }
@@ -658,9 +645,9 @@ struct bt_ctf_clock *bt_ctf_event_get_clock(struct bt_ctf_event *event)
 	}
 
 error_put_stream_class:
-	bt_ctf_stream_class_put(stream_class);
+	bt_put(stream_class);
 error_put_event_class:
-	bt_ctf_event_class_put(event_class);
+	bt_put(event_class);
 end:
 	return clock;
 }
@@ -684,19 +671,63 @@ int bt_ctf_event_set_payload(struct bt_ctf_event *event,
 
 		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);
+			bt_put(event->fields_payload);
+			bt_get(payload);
 			event->fields_payload = payload;
 		} else {
 			ret = -1;
 		}
 
-		bt_ctf_field_type_put(payload_type);
+		bt_put(payload_type);
 	}
 end:
 	return ret;
 }
 
+struct bt_ctf_field *bt_ctf_event_get_payload_field(struct bt_ctf_event *event)
+{
+	struct bt_ctf_field *payload = NULL;
+
+	if (!event || !event->fields_payload) {
+		goto end;
+	}
+
+	payload = event->fields_payload;
+	bt_get(payload);
+end:
+	return payload;
+}
+
+int bt_ctf_event_set_payload_field(struct bt_ctf_event *event,
+		struct bt_ctf_field *payload)
+{
+	int ret = 0;
+	struct bt_ctf_field_type *payload_type = NULL;
+
+	if (!event || !payload) {
+		ret = -1;
+		goto end;
+	}
+
+	payload_type = bt_ctf_field_get_type(payload);
+	if (!payload_type) {
+		ret = -1;
+		goto end;
+	}
+
+	if (bt_ctf_field_type_get_type_id(payload_type) != CTF_TYPE_STRUCT) {
+		ret = -1;
+		goto end;
+	}
+
+	bt_get(payload);
+	bt_put(event->fields_payload);
+	event->fields_payload = payload;
+
+end:
+	bt_put(payload_type);
+	return ret;
+}
 
 struct bt_ctf_field *bt_ctf_event_get_payload(struct bt_ctf_event *event,
 		const char *name)
@@ -712,7 +743,7 @@ struct bt_ctf_field *bt_ctf_event_get_payload(struct bt_ctf_event *event,
 			name);
 	} else {
 		field = event->fields_payload;
-		bt_ctf_field_get(field);
+		bt_get(field);
 	}
 end:
 	return field;
@@ -733,7 +764,7 @@ end:
 	return field;
 }
 
-struct bt_ctf_field *bt_ctf_event_get_event_header(
+struct bt_ctf_field *bt_ctf_event_get_header(
 		struct bt_ctf_event *event)
 {
 	struct bt_ctf_field *header = NULL;
@@ -743,12 +774,12 @@ struct bt_ctf_field *bt_ctf_event_get_event_header(
 	}
 
 	header = event->event_header;
-	bt_ctf_field_get(header);
+	bt_get(header);
 end:
 	return header;
 }
 
-int bt_ctf_event_set_event_header(struct bt_ctf_event *event,
+int bt_ctf_event_set_header(struct bt_ctf_event *event,
 		struct bt_ctf_field *header)
 {
 	int ret = 0;
@@ -775,13 +806,11 @@ int bt_ctf_event_set_event_header(struct bt_ctf_event *event,
 		goto end;
 	}
 
-	bt_ctf_field_get(header);
-	bt_ctf_field_put(event->event_header);
+	bt_get(header);
+	bt_put(event->event_header);
 	event->event_header = header;
 end:
-	if (field_type) {
-		bt_ctf_field_type_put(field_type);
-	}
+	bt_put(field_type);
 	return ret;
 }
 
@@ -795,7 +824,7 @@ struct bt_ctf_field *bt_ctf_event_get_event_context(
 	}
 
 	context = event->context_payload;
-	bt_ctf_field_get(context);
+	bt_get(context);
 end:
 	return context;
 }
@@ -817,83 +846,50 @@ int bt_ctf_event_set_event_context(struct bt_ctf_event *event,
 		goto end;
 	}
 
-	bt_ctf_field_get(context);
-	bt_ctf_field_put(event->context_payload);
+	bt_get(context);
+	bt_put(event->context_payload);
 	event->context_payload = context;
 end:
-	if (field_type) {
-		bt_ctf_field_type_put(field_type);
-	}
+	bt_put(field_type);
 	return ret;
 }
 
 void bt_ctf_event_get(struct bt_ctf_event *event)
 {
-	if (!event) {
-		return;
-	}
-
-	bt_ctf_ref_get(&event->ref_count);
+	bt_get(event);
 }
 
 void bt_ctf_event_put(struct bt_ctf_event *event)
 {
-	if (!event) {
-		return;
-	}
-
-	bt_ctf_ref_put(&event->ref_count, bt_ctf_event_destroy);
+	bt_put(event);
 }
 
 static
-void bt_ctf_event_class_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_event_class_destroy(struct bt_object *obj)
 {
 	struct bt_ctf_event_class *event_class;
 
-	if (!ref) {
-		return;
-	}
-
 	/*
 	 * Don't call put() on the stream class. See comment in
 	 * bt_ctf_event_class_set_stream_class for explanation.
 	 */
-	event_class = container_of(ref, struct bt_ctf_event_class, ref_count);
-	if (event_class->attributes) {
-		bt_ctf_attributes_destroy(event_class->attributes);
-	}
-	if (event_class->context) {
-		bt_ctf_field_type_put(event_class->context);
-	}
-	if (event_class->fields) {
-		bt_ctf_field_type_put(event_class->fields);
-	}
+	event_class = container_of(obj, struct bt_ctf_event_class, base);
+	bt_ctf_attributes_destroy(event_class->attributes);
+	bt_put(event_class->context);
+	bt_put(event_class->fields);
 	g_free(event_class);
 }
 
 static
-void bt_ctf_event_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_event_destroy(struct bt_object *obj)
 {
 	struct bt_ctf_event *event;
 
-	if (!ref) {
-		return;
-	}
-
-	event = container_of(ref, struct bt_ctf_event,
-		ref_count);
-	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);
-	}
+	event = container_of(obj, struct bt_ctf_event, base);
+	bt_put(event->event_class);
+	bt_put(event->event_header);
+	bt_put(event->context_payload);
+	bt_put(event->fields_payload);
 	g_free(event);
 }
 
@@ -936,7 +932,7 @@ int set_integer_field_value(struct bt_ctf_field* field, uint64_t value)
 		}
 	}
 end:
-	bt_ctf_field_type_put(field_type);
+	bt_put(field_type);
 	return ret;
 }
 
@@ -987,7 +983,7 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
 	int i;
 	int count;
 	int ret = 0;
-	struct bt_object *attr_value = NULL;
+	struct bt_value *attr_value = NULL;
 
 	assert(event_class);
 	assert(context);
@@ -1015,12 +1011,12 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
 			goto end;
 		}
 
-		switch (bt_object_get_type(attr_value)) {
-		case BT_OBJECT_TYPE_INTEGER:
+		switch (bt_value_get_type(attr_value)) {
+		case BT_VALUE_TYPE_INTEGER:
 		{
 			int64_t value;
 
-			ret = bt_object_integer_get(attr_value, &value);
+			ret = bt_value_integer_get(attr_value, &value);
 
 			if (ret) {
 				goto end;
@@ -1031,11 +1027,11 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
 			break;
 		}
 
-		case BT_OBJECT_TYPE_STRING:
+		case BT_VALUE_TYPE_STRING:
 		{
 			const char *value;
 
-			ret = bt_object_string_get(attr_value, &value);
+			ret = bt_value_string_get(attr_value, &value);
 
 			if (ret) {
 				goto end;
@@ -1052,7 +1048,7 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
 			break;
 		}
 
-		BT_OBJECT_PUT(attr_value);
+		BT_PUT(attr_value);
 	}
 
 	if (event_class->context) {
@@ -1077,7 +1073,7 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
 	g_string_append(context->string, "};\n\n");
 end:
 	context->current_indentation_level = 0;
-	BT_OBJECT_PUT(attr_value);
+	BT_PUT(attr_value);
 	return ret;
 }
 
@@ -1175,12 +1171,12 @@ int bt_ctf_event_populate_event_header(struct bt_ctf_event *event)
 		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);
+		bt_put(timestamp_field_type);
 		if (mapped_clock) {
 			uint64_t timestamp = bt_ctf_clock_get_time(
 				mapped_clock);
 
-			bt_ctf_clock_put(mapped_clock);
+			bt_put(mapped_clock);
 			if (timestamp == (uint64_t) -1ULL) {
 				goto end;
 			}
@@ -1193,12 +1189,8 @@ int bt_ctf_event_populate_event_header(struct bt_ctf_event *event)
 		}
 	}
 end:
-	if (id_field) {
-		bt_ctf_field_put(id_field);
-	}
-	if (timestamp_field) {
-		bt_ctf_field_put(timestamp_field);
-	}
+	bt_put(id_field);
+	bt_put(timestamp_field);
 	return ret;
 }
 
@@ -1223,3 +1215,53 @@ int bt_ctf_event_set_stream(struct bt_ctf_event *event,
 end:
 	return ret;
 }
+
+struct bt_ctf_event *bt_ctf_event_copy(struct bt_ctf_event *event)
+{
+	struct bt_ctf_event *copy = NULL;
+
+	if (!event) {
+		goto error;
+	}
+
+	copy = g_new0(struct bt_ctf_event, 1);
+	if (!copy) {
+		goto error;
+	}
+
+	bt_object_init(copy, bt_ctf_event_destroy);
+	copy->event_class = event->event_class;
+	bt_get(copy->event_class);
+	copy->stream = event->stream;
+
+	if (event->event_header) {
+		copy->event_header = bt_ctf_field_copy(event->event_header);
+
+		if (!copy->event_header) {
+			goto error;
+		}
+	}
+
+	if (event->context_payload) {
+		copy->context_payload = bt_ctf_field_copy(
+			event->context_payload);
+
+		if (!copy->context_payload) {
+			goto error;
+		}
+	}
+
+	if (event->fields_payload) {
+		copy->fields_payload = bt_ctf_field_copy(event->fields_payload);
+
+		if (!copy->fields_payload) {
+			goto error;
+		}
+	}
+
+	return copy;
+
+error:
+	BT_PUT(copy);
+	return copy;
+}