X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ftrace-ir%2Fclock-class.c;h=34e3a87b26d4d480bafc7963db8b03b6e821388c;hb=520cdc8260ea033f1c9f54b87d93fcb034ae8472;hp=dd78c8c938bb184649b85f4236430394bcb173af;hpb=350ad6c1c5f45a4e90c33e3c1354125c209bbf02;p=babeltrace.git

diff --git a/src/lib/trace-ir/clock-class.c b/src/lib/trace-ir/clock-class.c
index dd78c8c9..34e3a87b 100644
--- a/src/lib/trace-ir/clock-class.c
+++ b/src/lib/trace-ir/clock-class.c
@@ -22,10 +22,10 @@
  */
 
 #define BT_LOG_TAG "LIB/CLOCK-CLASS"
-#include "lib/lib-logging.h"
+#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"
@@ -37,9 +37,10 @@
 #include <inttypes.h>
 #include "lib/object.h"
 #include "common/assert.h"
+#include "lib/func-status.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)
@@ -89,20 +90,20 @@ struct bt_clock_class *bt_clock_class_create(bt_self_component *self_comp)
 
 	clock_class = g_new0(struct bt_clock_class, 1);
 	if (!clock_class) {
-		BT_LOGE_STR("Failed to allocate one clock class.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one clock class.");
 		goto error;
 	}
 
 	bt_object_init_shared(&clock_class->base, destroy_clock_class);
 	clock_class->name.str = g_string_new(NULL);
 	if (!clock_class->name.str) {
-		BT_LOGE_STR("Failed to allocate a GString.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
 		goto error;
 	}
 
 	clock_class->description.str = g_string_new(NULL);
 	if (!clock_class->description.str) {
-		BT_LOGE_STR("Failed to allocate a GString.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
 		goto error;
 	}
 
@@ -115,7 +116,8 @@ struct bt_clock_class *bt_clock_class_create(bt_self_component *self_comp)
 			free_clock_snapshot,
 		clock_class);
 	if (ret) {
-		BT_LOGE("Failed to initialize clock snapshot pool: ret=%d",
+		BT_LIB_LOGE_APPEND_CAUSE(
+			"Failed to initialize clock snapshot pool: ret=%d",
 			ret);
 		goto error;
 	}
@@ -132,45 +134,45 @@ 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;
 }
 
-enum bt_clock_class_status bt_clock_class_set_name(
+enum bt_clock_class_set_name_status bt_clock_class_set_name(
 		struct bt_clock_class *clock_class, const char *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);
-	return BT_CLOCK_CLASS_STATUS_OK;
+	return BT_FUNC_STATUS_OK;
 }
 
 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;
 }
 
-enum bt_clock_class_status bt_clock_class_set_description(
+enum bt_clock_class_set_description_status bt_clock_class_set_description(
 		struct bt_clock_class *clock_class, const char *descr)
 {
 	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",
 		clock_class);
-	return BT_CLOCK_CLASS_STATUS_OK;
+	return BT_FUNC_STATUS_OK;
 }
 
 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;
 }
 
@@ -178,7 +180,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);
@@ -192,7 +194,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;
 }
 
@@ -200,7 +202,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);
@@ -211,9 +213,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;
 }
@@ -222,7 +224,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);
@@ -234,7 +236,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;
 }
 
@@ -242,7 +244,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);
@@ -250,7 +252,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;
 }
 
@@ -259,8 +261,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);
 }
@@ -278,22 +280,23 @@ void _bt_clock_class_freeze(const struct bt_clock_class *clock_class)
 	((struct bt_clock_class *) clock_class)->frozen = 1;
 }
 
-enum bt_clock_class_status bt_clock_class_cycles_to_ns_from_origin(
+enum bt_clock_class_cycles_to_ns_from_origin_status
+bt_clock_class_cycles_to_ns_from_origin(
 		const struct bt_clock_class *clock_class,
 		uint64_t cycles, int64_t *ns)
 {
 	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_CLOCK_CLASS_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;