X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fclock-class.c;h=c394454816039304a376d3bcf34bd27c44f1b58b;hb=392df1b75e87e51f679c48aa3776d54ef02ee8d7;hp=43341d0f963561a77970c3724cf0169b95186b09;hpb=a8f90e5d4a5876324aaefc98c3314b8a35c86644;p=babeltrace.git

diff --git a/src/lib/trace-ir/clock-class.c b/src/lib/trace-ir/clock-class.c
index 43341d0f..c3944548 100644
--- a/src/lib/trace-ir/clock-class.c
+++ b/src/lib/trace-ir/clock-class.c
@@ -25,7 +25,7 @@
 #include "lib/logging.h"
 
 #include "lib/assert-pre.h"
-#include "compat/uuid.h"
+#include "common/uuid.h"
 #include <babeltrace2/trace-ir/clock-class-const.h>
 #include <babeltrace2/trace-ir/clock-class.h>
 #include "clock-class.h"
@@ -38,9 +38,10 @@
 #include "lib/object.h"
 #include "common/assert.h"
 #include "lib/func-status.h"
+#include "lib/value.h"
 
-#define BT_ASSERT_PRE_CLOCK_CLASS_HOT(_cc) \
-	BT_ASSERT_PRE_HOT((_cc), "Clock class", ": %!+K", (_cc))
+#define BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(_cc) \
+	BT_ASSERT_PRE_DEV_HOT((_cc), "Clock class", ": %!+K", (_cc))
 
 static
 void destroy_clock_class(struct bt_object *obj)
@@ -48,6 +49,7 @@ void destroy_clock_class(struct bt_object *obj)
 	struct bt_clock_class *clock_class = (void *) obj;
 
 	BT_LIB_LOGD("Destroying clock class: %!+K", clock_class);
+	BT_OBJECT_PUT_REF_AND_RESET(clock_class->user_attributes);
 
 	if (clock_class->name.str) {
 		g_string_free(clock_class->name.str, TRUE);
@@ -95,6 +97,14 @@ struct bt_clock_class *bt_clock_class_create(bt_self_component *self_comp)
 	}
 
 	bt_object_init_shared(&clock_class->base, destroy_clock_class);
+
+	clock_class->user_attributes = bt_value_map_create();
+	if (!clock_class->user_attributes) {
+		BT_LIB_LOGE_APPEND_CAUSE(
+			"Failed to create a map value object.");
+		goto error;
+	}
+
 	clock_class->name.str = g_string_new(NULL);
 	if (!clock_class->name.str) {
 		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
@@ -134,7 +144,7 @@ end:
 
 const char *bt_clock_class_get_name(const struct bt_clock_class *clock_class)
 {
-	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
 	return clock_class->name.value;
 }
 
@@ -143,7 +153,7 @@ enum bt_clock_class_set_name_status bt_clock_class_set_name(
 {
 	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
 	BT_ASSERT_PRE_NON_NULL(name, "Name");
-	BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
+	BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(clock_class);
 	g_string_assign(clock_class->name.str, name);
 	clock_class->name.value = clock_class->name.str->str;
 	BT_LIB_LOGD("Set clock class's name: %!+K", clock_class);
@@ -153,7 +163,7 @@ enum bt_clock_class_set_name_status bt_clock_class_set_name(
 const char *bt_clock_class_get_description(
 		const struct bt_clock_class *clock_class)
 {
-	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
 	return clock_class->description.value;
 }
 
@@ -162,7 +172,7 @@ enum bt_clock_class_set_description_status bt_clock_class_set_description(
 {
 	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
 	BT_ASSERT_PRE_NON_NULL(descr, "Description");
-	BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
+	BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(clock_class);
 	g_string_assign(clock_class->description.str, descr);
 	clock_class->description.value = clock_class->description.str->str;
 	BT_LIB_LOGD("Set clock class's description: %!+K",
@@ -172,7 +182,7 @@ enum bt_clock_class_set_description_status bt_clock_class_set_description(
 
 uint64_t bt_clock_class_get_frequency(const struct bt_clock_class *clock_class)
 {
-	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
 	return clock_class->frequency;
 }
 
@@ -180,7 +190,7 @@ void bt_clock_class_set_frequency(struct bt_clock_class *clock_class,
 		uint64_t frequency)
 {
 	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
-	BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
+	BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(clock_class);
 	BT_ASSERT_PRE(frequency != UINT64_C(-1) && frequency != 0,
 		"Invalid frequency: %![cc-]+K, new-freq=%" PRIu64,
 		clock_class, frequency);
@@ -194,7 +204,7 @@ void bt_clock_class_set_frequency(struct bt_clock_class *clock_class,
 
 uint64_t bt_clock_class_get_precision(const struct bt_clock_class *clock_class)
 {
-	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
 	return clock_class->precision;
 }
 
@@ -202,7 +212,7 @@ void bt_clock_class_set_precision(struct bt_clock_class *clock_class,
 		uint64_t precision)
 {
 	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
-	BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
+	BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(clock_class);
 	BT_ASSERT_PRE(precision != UINT64_C(-1),
 		"Invalid precision: %![cc-]+K, new-precision=%" PRIu64,
 		clock_class, precision);
@@ -213,9 +223,9 @@ void bt_clock_class_set_precision(struct bt_clock_class *clock_class,
 void bt_clock_class_get_offset(const struct bt_clock_class *clock_class,
 		int64_t *seconds, uint64_t *cycles)
 {
-	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
-	BT_ASSERT_PRE_NON_NULL(seconds, "Seconds (output)");
-	BT_ASSERT_PRE_NON_NULL(cycles, "Cycles (output)");
+	BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_DEV_NON_NULL(seconds, "Seconds (output)");
+	BT_ASSERT_PRE_DEV_NON_NULL(cycles, "Cycles (output)");
 	*seconds = clock_class->offset_seconds;
 	*cycles = clock_class->offset_cycles;
 }
@@ -224,7 +234,7 @@ void bt_clock_class_set_offset(struct bt_clock_class *clock_class,
 		int64_t seconds, uint64_t cycles)
 {
 	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
-	BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
+	BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(clock_class);
 	BT_ASSERT_PRE(cycles < clock_class->frequency,
 		"Offset (cycles) is greater than clock class's frequency: "
 		"%![cc-]+K, new-offset-cycles=%" PRIu64, clock_class, cycles);
@@ -236,7 +246,7 @@ void bt_clock_class_set_offset(struct bt_clock_class *clock_class,
 
 bt_bool bt_clock_class_origin_is_unix_epoch(const struct bt_clock_class *clock_class)
 {
-	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
 	return (bool) clock_class->origin_is_unix_epoch;
 }
 
@@ -244,7 +254,7 @@ void bt_clock_class_set_origin_is_unix_epoch(struct bt_clock_class *clock_class,
 		bt_bool origin_is_unix_epoch)
 {
 	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
-	BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
+	BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(clock_class);
 	clock_class->origin_is_unix_epoch = (bool) origin_is_unix_epoch;
 	BT_LIB_LOGD("Set clock class's origin is Unix epoch property: %!+K",
 		clock_class);
@@ -252,7 +262,7 @@ void bt_clock_class_set_origin_is_unix_epoch(struct bt_clock_class *clock_class,
 
 bt_uuid bt_clock_class_get_uuid(const struct bt_clock_class *clock_class)
 {
-	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
 	return clock_class->uuid.value;
 }
 
@@ -261,8 +271,8 @@ void bt_clock_class_set_uuid(struct bt_clock_class *clock_class,
 {
 	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
 	BT_ASSERT_PRE_NON_NULL(uuid, "UUID");
-	BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
-	memcpy(clock_class->uuid.uuid, uuid, BABELTRACE_UUID_LEN);
+	BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(clock_class);
+	bt_uuid_copy(clock_class->uuid.uuid, uuid);
 	clock_class->uuid.value = clock_class->uuid.uuid;
 	BT_LIB_LOGD("Set clock class's UUID: %!+K", clock_class);
 }
@@ -276,6 +286,9 @@ void _bt_clock_class_freeze(const struct bt_clock_class *clock_class)
 		return;
 	}
 
+	BT_LIB_LOGD("Freezing clock class's user attributes: %!+v",
+		clock_class->user_attributes);
+	bt_value_freeze(clock_class->user_attributes);
 	BT_LIB_LOGD("Freezing clock class: %!+K", clock_class);
 	((struct bt_clock_class *) clock_class)->frozen = 1;
 }
@@ -287,21 +300,49 @@ bt_clock_class_cycles_to_ns_from_origin(
 {
 	int ret;
 
-	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
-	BT_ASSERT_PRE_NON_NULL(ns, "Nanoseconds (output)");
+	BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_DEV_NON_NULL(ns, "Nanoseconds (output)");
 	ret = bt_util_ns_from_origin_clock_class(clock_class, cycles, ns);
 	if (ret) {
-		ret = BT_FUNC_STATUS_OVERFLOW;
-		BT_LIB_LOGD("Cannot convert cycles to nanoseconds "
+		BT_LIB_LOGE_APPEND_CAUSE("Cannot convert cycles to nanoseconds "
 			"from origin for given clock class: "
 			"value overflows the signed 64-bit integer range: "
 			"%![cc-]+K, cycles=%" PRIu64,
 			clock_class, cycles);
+		ret = BT_FUNC_STATUS_OVERFLOW_ERROR;
 	}
 
 	return ret;
 }
 
+const struct bt_value *bt_clock_class_borrow_user_attributes_const(
+		const struct bt_clock_class *clock_class)
+{
+	BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
+	return clock_class->user_attributes;
+}
+
+struct bt_value *bt_clock_class_borrow_user_attributes(
+		struct bt_clock_class *clock_class)
+{
+	return (void *) bt_clock_class_borrow_user_attributes_const(
+		(void *) clock_class);
+}
+
+void bt_clock_class_set_user_attributes(
+		struct bt_clock_class *clock_class,
+		const struct bt_value *user_attributes)
+{
+	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock 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_CLOCK_CLASS_HOT(clock_class);
+	bt_object_put_ref_no_null_check(clock_class->user_attributes);
+	clock_class->user_attributes = (void *) user_attributes;
+	bt_object_get_ref_no_null_check(clock_class->user_attributes);
+}
+
 void bt_clock_class_get_ref(const struct bt_clock_class *clock_class)
 {
 	bt_object_get_ref(clock_class);