X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fevent-class.c;h=ae7653e93a7679e662fe4e4c08b0dff69d6c7fcd;hb=c6962c968f7467ce8f7e880e7de3797139314f9f;hp=49ff7ff6c0a109cf9d3f1528e522ebf8535f1d69;hpb=d24d56638469189904fb6ddbb3c725817b3e9417;p=babeltrace.git

diff --git a/src/lib/trace-ir/event-class.c b/src/lib/trace-ir/event-class.c
index 49ff7ff6..ae7653e9 100644
--- a/src/lib/trace-ir/event-class.c
+++ b/src/lib/trace-ir/event-class.c
@@ -49,8 +49,8 @@
 #include "utils.h"
 #include "lib/func-status.h"
 
-#define BT_ASSERT_PRE_EVENT_CLASS_HOT(_ec) \
-	BT_ASSERT_PRE_HOT(((const struct bt_event_class *) (_ec)),	\
+#define BT_ASSERT_PRE_DEV_EVENT_CLASS_HOT(_ec) \
+	BT_ASSERT_PRE_DEV_HOT(((const struct bt_event_class *) (_ec)),	\
 		"Event class", ": %!+E", (_ec))
 
 static
@@ -59,6 +59,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 +86,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)
@@ -122,27 +122,32 @@ struct bt_event_class *create_event_class_with_id(
 		stream_class, id);
 	event_class = g_new0(struct bt_event_class, 1);
 	if (!event_class) {
-		BT_LOGE_STR("Failed to allocate one event class.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one event class.");
 		goto error;
 	}
 
 	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_LOGE_STR("Failed to allocate a GString.");
-		ret = -1;
-		goto end;
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
+		goto error;
 	}
 
 	event_class->emf_uri.str = g_string_new(NULL);
 	if (!event_class->emf_uri.str) {
-		BT_LOGE_STR("Failed to allocate a GString.");
-		ret = -1;
-		goto end;
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
+		goto error;
 	}
 
 	ret = bt_object_pool_initialize(&event_class->event_pool,
@@ -150,7 +155,8 @@ struct bt_event_class *create_event_class_with_id(
 		(bt_object_pool_destroy_object_func) free_event,
 		event_class);
 	if (ret) {
-		BT_LOGE("Failed to initialize event pool: ret=%d",
+		BT_LIB_LOGE_APPEND_CAUSE(
+			"Failed to initialize event pool: ret=%d",
 			ret);
 		goto error;
 	}
@@ -190,7 +196,7 @@ struct bt_event_class *bt_event_class_create_with_id(
 
 const char *bt_event_class_get_name(const struct bt_event_class *event_class)
 {
-	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+	BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
 	return event_class->name.value;
 }
 
@@ -199,7 +205,7 @@ enum bt_event_class_set_name_status bt_event_class_set_name(
 {
 	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
 	BT_ASSERT_PRE_NON_NULL(name, "Name");
-	BT_ASSERT_PRE_EVENT_CLASS_HOT(event_class);
+	BT_ASSERT_PRE_DEV_EVENT_CLASS_HOT(event_class);
 	g_string_assign(event_class->name.str, name);
 	event_class->name.value = event_class->name.str->str;
 	BT_LIB_LOGD("Set event class's name: %!+E", event_class);
@@ -208,7 +214,7 @@ enum bt_event_class_set_name_status bt_event_class_set_name(
 
 uint64_t bt_event_class_get_id(const struct bt_event_class *event_class)
 {
-	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+	BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
 	return event_class->id;
 }
 
@@ -216,8 +222,8 @@ enum bt_property_availability bt_event_class_get_log_level(
 		const struct bt_event_class *event_class,
 		enum bt_event_class_log_level *log_level)
 {
-	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
-	BT_ASSERT_PRE_NON_NULL(log_level, "Log level (output)");
+	BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
+	BT_ASSERT_PRE_DEV_NON_NULL(log_level, "Log level (output)");
 	*log_level = (enum bt_event_class_log_level)
 		event_class->log_level.value;
 	return event_class->log_level.base.avail;
@@ -228,7 +234,7 @@ void bt_event_class_set_log_level(
 		enum bt_event_class_log_level log_level)
 {
 	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
-	BT_ASSERT_PRE_EVENT_CLASS_HOT(event_class);
+	BT_ASSERT_PRE_DEV_EVENT_CLASS_HOT(event_class);
 	bt_property_uint_set(&event_class->log_level,
 		(uint64_t) log_level);
 	BT_LIB_LOGD("Set event class's log level: %!+E", event_class);
@@ -236,7 +242,7 @@ void bt_event_class_set_log_level(
 
 const char *bt_event_class_get_emf_uri(const struct bt_event_class *event_class)
 {
-	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+	BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
 	return event_class->emf_uri.value;
 }
 
@@ -246,7 +252,7 @@ enum bt_event_class_set_emf_uri_status bt_event_class_set_emf_uri(
 {
 	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
 	BT_ASSERT_PRE_NON_NULL(emf_uri, "EMF URI");
-	BT_ASSERT_PRE_EVENT_CLASS_HOT(event_class);
+	BT_ASSERT_PRE_DEV_EVENT_CLASS_HOT(event_class);
 	g_string_assign(event_class->emf_uri.str, emf_uri);
 	event_class->emf_uri.value = event_class->emf_uri.str->str;
 	BT_LIB_LOGD("Set event class's EMF URI: %!+E", event_class);
@@ -256,7 +262,7 @@ enum bt_event_class_set_emf_uri_status bt_event_class_set_emf_uri(
 struct bt_stream_class *bt_event_class_borrow_stream_class(
 		struct bt_event_class *event_class)
 {
-	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+	BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
 	return bt_event_class_borrow_stream_class_inline(event_class);
 }
 
@@ -271,7 +277,7 @@ const struct bt_field_class *
 bt_event_class_borrow_specific_context_field_class_const(
 		const struct bt_event_class *event_class)
 {
-	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+	BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
 	return event_class->specific_context_fc;
 }
 
@@ -279,7 +285,7 @@ struct bt_field_class *
 bt_event_class_borrow_specific_context_field_class(
 		struct bt_event_class *event_class)
 {
-	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+	BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
 	return event_class->specific_context_fc;
 }
 
@@ -299,7 +305,7 @@ bt_event_class_set_specific_context_field_class(
 
 	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
 	BT_ASSERT_PRE_NON_NULL(field_class, "Field class");
-	BT_ASSERT_PRE_EVENT_CLASS_HOT(event_class);
+	BT_ASSERT_PRE_DEV_EVENT_CLASS_HOT(event_class);
 	BT_ASSERT_PRE(bt_field_class_get_type(field_class) ==
 		BT_FIELD_CLASS_TYPE_STRUCTURE,
 		"Specific context field class is not a structure field class: "
@@ -336,14 +342,14 @@ end:
 const struct bt_field_class *bt_event_class_borrow_payload_field_class_const(
 		const struct bt_event_class *event_class)
 {
-	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+	BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
 	return event_class->payload_fc;
 }
 
 struct bt_field_class *bt_event_class_borrow_payload_field_class(
 		struct bt_event_class *event_class)
 {
-	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+	BT_ASSERT_PRE_DEV_NON_NULL(event_class, "Event class");
 	return event_class->payload_fc;
 }
 
@@ -363,7 +369,7 @@ bt_event_class_set_payload_field_class(
 
 	BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
 	BT_ASSERT_PRE_NON_NULL(field_class, "Field class");
-	BT_ASSERT_PRE_EVENT_CLASS_HOT(event_class);
+	BT_ASSERT_PRE_DEV_EVENT_CLASS_HOT(event_class);
 	BT_ASSERT_PRE(bt_field_class_get_type(field_class) ==
 		BT_FIELD_CLASS_TYPE_STRUCTURE,
 		"Payload field class is not a structure field class: %!+F",
@@ -402,10 +408,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_no_null_check(event_class->user_attributes);
+	event_class->user_attributes = (void *) user_attributes;
+	bt_object_get_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);