X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fevent-class.c;h=ba79f28b6ff7ca1eb5865f05e87b89216e04d426;hb=c4f23e30bf67d2523163614bc9461d84cbe1ae80;hp=efbd676654cdfaa8e6cca8afb329e5fc3f9b8b44;hpb=bdb288b3e94e412a33c8647d44f6cfac66ca0665;p=babeltrace.git

diff --git a/src/lib/trace-ir/event-class.c b/src/lib/trace-ir/event-class.c
index efbd6766..ba79f28b 100644
--- a/src/lib/trace-ir/event-class.c
+++ b/src/lib/trace-ir/event-class.c
@@ -35,6 +35,7 @@
 #include "lib/value.h"
 #include "common/assert.h"
 #include <inttypes.h>
+#include <stdbool.h>
 #include <stdlib.h>
 
 #include "attributes.h"
@@ -59,6 +60,7 @@ void destroy_event_class(struct bt_object *obj)
 	struct bt_event_class *event_class = (void *) obj;
 
 	BT_LIB_LOGD("Destroying event class: %!+E", event_class);
+	BT_OBJECT_PUT_REF_AND_RESET(event_class->user_attributes);
 
 	if (event_class->name.str) {
 		g_string_free(event_class->name.str, TRUE);
@@ -85,7 +87,6 @@ void free_event(struct bt_event *event,
 	bt_event_destroy(event);
 }
 
-BT_ASSERT_PRE_FUNC
 static
 bool event_class_id_is_unique(const struct bt_stream_class *stream_class,
 		uint64_t id)
@@ -128,21 +129,26 @@ struct bt_event_class *create_event_class_with_id(
 
 	bt_object_init_shared_with_parent(&event_class->base,
 		destroy_event_class);
+	event_class->user_attributes = bt_value_map_create();
+	if (!event_class->user_attributes) {
+		BT_LIB_LOGE_APPEND_CAUSE(
+			"Failed to create a map value object.");
+		goto error;
+	}
+
 	event_class->id = id;
 	bt_property_uint_init(&event_class->log_level,
 			BT_PROPERTY_AVAILABILITY_NOT_AVAILABLE, 0);
 	event_class->name.str = g_string_new(NULL);
 	if (!event_class->name.str) {
 		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
-		ret = -1;
-		goto end;
+		goto error;
 	}
 
 	event_class->emf_uri.str = g_string_new(NULL);
 	if (!event_class->emf_uri.str) {
 		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
-		ret = -1;
-		goto end;
+		goto error;
 	}
 
 	ret = bt_object_pool_initialize(&event_class->event_pool,
@@ -325,7 +331,7 @@ bt_event_class_set_specific_context_field_class(
 	bt_field_class_make_part_of_trace_class(field_class);
 	bt_object_put_ref(event_class->specific_context_fc);
 	event_class->specific_context_fc = field_class;
-	bt_object_get_no_null_check(event_class->specific_context_fc);
+	bt_object_get_ref_no_null_check(event_class->specific_context_fc);
 	bt_field_class_freeze(field_class);
 	BT_LIB_LOGD("Set event class's specific context field class: %!+E",
 		event_class);
@@ -390,7 +396,7 @@ bt_event_class_set_payload_field_class(
 	bt_field_class_make_part_of_trace_class(field_class);
 	bt_object_put_ref(event_class->payload_fc);
 	event_class->payload_fc = field_class;
-	bt_object_get_no_null_check(event_class->payload_fc);
+	bt_object_get_ref_no_null_check(event_class->payload_fc);
 	bt_field_class_freeze(field_class);
 	BT_LIB_LOGD("Set event class's payload field class: %!+E", event_class);
 
@@ -403,10 +409,41 @@ void _bt_event_class_freeze(const struct bt_event_class *event_class)
 {
 	/* The field classes are already frozen */
 	BT_ASSERT(event_class);
+	BT_LIB_LOGD("Freezing event class's user attributes: %!+v",
+		event_class->user_attributes);
+	bt_value_freeze(event_class->user_attributes);
 	BT_LIB_LOGD("Freezing event class: %!+E", event_class);
 	((struct bt_event_class *) event_class)->frozen = true;
 }
 
+const struct bt_value *bt_event_class_borrow_user_attributes_const(
+		const struct bt_event_class *event_class)
+{
+	BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
+	return event_class->user_attributes;
+}
+
+struct bt_value *bt_event_class_borrow_user_attributes(
+		struct bt_event_class *event_class)
+{
+	return (void *) bt_event_class_borrow_user_attributes_const(
+		(void *) event_class);
+}
+
+void bt_event_class_set_user_attributes(
+		struct bt_event_class *event_class,
+		const struct bt_value *user_attributes)
+{
+	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+	BT_ASSERT_PRE_NON_NULL(user_attributes, "User attributes");
+	BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP,
+		"User attributes object is not a map value object.");
+	BT_ASSERT_PRE_DEV_EVENT_CLASS_HOT(event_class);
+	bt_object_put_ref_no_null_check(event_class->user_attributes);
+	event_class->user_attributes = (void *) user_attributes;
+	bt_object_get_ref_no_null_check(event_class->user_attributes);
+}
+
 void bt_event_class_get_ref(const struct bt_event_class *event_class)
 {
 	bt_object_get_ref(event_class);