X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Ftrace-ir%2Fclock-class.c;h=f21518e6c5061975516e2a27c8ab1ac50a067cd6;hb=35fa110e5bea4a35497313adf3e3d0fa09db9ff7;hp=a2465b41396bebe7b0e05261c32960b320b723bc;hpb=ecbb78c04e4229f7fed3133a3d878c135d160db3;p=babeltrace.git

diff --git a/lib/trace-ir/clock-class.c b/lib/trace-ir/clock-class.c
index a2465b41..f21518e6 100644
--- a/lib/trace-ir/clock-class.c
+++ b/lib/trace-ir/clock-class.c
@@ -26,6 +26,8 @@
 
 #include <babeltrace/assert-pre-internal.h>
 #include <babeltrace/compat/uuid-internal.h>
+#include <babeltrace/trace-ir/clock-class-const.h>
+#include <babeltrace/trace-ir/clock-class.h>
 #include <babeltrace/trace-ir/clock-class-internal.h>
 #include <babeltrace/trace-ir/clock-snapshot-internal.h>
 #include <babeltrace/trace-ir/utils-internal.h>
@@ -72,43 +74,17 @@ void free_clock_snapshot(struct bt_clock_snapshot *clock_snapshot,
 static inline
 void set_base_offset(struct bt_clock_class *clock_class)
 {
-	uint64_t offset_cycles_ns;
-
-	/* Initialize nanosecond timestamp to clock's offset in seconds */
-	if (clock_class->offset_seconds <= (INT64_MIN / INT64_C(1000000000) - 1) ||
-			clock_class->offset_seconds >= (INT64_MAX / INT64_C(1000000000)) - 1) {
-		/*
-		 * Overflow: offset in seconds converted to nanoseconds
-		 * is outside the int64_t range. We also subtract 1 here
-		 * to leave "space" for the offset in cycles converted
-		 * to nanoseconds (which is always less than 1 second by
-		 * contract).
-		 */
-		clock_class->base_offset.overflows = true;
-		goto end;
-	}
-
-	/* Offset (seconds) to nanoseconds */
-	clock_class->base_offset.value_ns = clock_class->offset_seconds *
-		INT64_C(1000000000);
-
-	/* Add offset in cycles */
-	BT_ASSERT(clock_class->offset_cycles < clock_class->frequency);
-	offset_cycles_ns = bt_util_ns_from_value(clock_class->frequency,
-		clock_class->offset_cycles);
-	BT_ASSERT(offset_cycles_ns < 1000000000);
-	clock_class->base_offset.value_ns += (int64_t) offset_cycles_ns;
-	clock_class->base_offset.overflows = false;
-
-end:
-	return;
+	clock_class->base_offset.overflows = bt_util_get_base_offset_ns(
+		clock_class->offset_seconds, clock_class->offset_cycles,
+		clock_class->frequency, &clock_class->base_offset.value_ns);
 }
 
-struct bt_clock_class *bt_clock_class_create(void)
+struct bt_clock_class *bt_clock_class_create(bt_trace_class *trace_class)
 {
 	int ret;
 	struct bt_clock_class *clock_class = NULL;
 
+	BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
 	BT_LOGD_STR("Creating default clock class object");
 
 	clock_class = g_new0(struct bt_clock_class, 1);
@@ -160,8 +136,8 @@ const char *bt_clock_class_get_name(const struct bt_clock_class *clock_class)
 	return clock_class->name.value;
 }
 
-int bt_clock_class_set_name(struct bt_clock_class *clock_class,
-		const char *name)
+enum bt_clock_class_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");
@@ -169,7 +145,7 @@ int bt_clock_class_set_name(struct bt_clock_class *clock_class,
 	g_string_assign(clock_class->name.str, name);
 	clock_class->name.value = clock_class->name.str->str;
 	BT_LIB_LOGV("Set clock class's name: %!+K", clock_class);
-	return 0;
+	return BT_CLOCK_CLASS_STATUS_OK;
 }
 
 const char *bt_clock_class_get_description(
@@ -179,8 +155,8 @@ const char *bt_clock_class_get_description(
 	return clock_class->description.value;
 }
 
-int bt_clock_class_set_description(struct bt_clock_class *clock_class,
-		const char *descr)
+enum bt_clock_class_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");
@@ -189,7 +165,7 @@ int bt_clock_class_set_description(struct bt_clock_class *clock_class,
 	clock_class->description.value = clock_class->description.str->str;
 	BT_LIB_LOGV("Set clock class's description: %!+K",
 		clock_class);
-	return 0;
+	return BT_CLOCK_CLASS_STATUS_OK;
 }
 
 uint64_t bt_clock_class_get_frequency(const struct bt_clock_class *clock_class)
@@ -302,7 +278,7 @@ void _bt_clock_class_freeze(const struct bt_clock_class *clock_class)
 	((struct bt_clock_class *) clock_class)->frozen = 1;
 }
 
-int bt_clock_class_cycles_to_ns_from_origin(
+enum bt_clock_class_status bt_clock_class_cycles_to_ns_from_origin(
 		const struct bt_clock_class *clock_class,
 		uint64_t cycles, int64_t *ns)
 {
@@ -310,8 +286,9 @@ int bt_clock_class_cycles_to_ns_from_origin(
 
 	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
 	BT_ASSERT_PRE_NON_NULL(ns, "Nanoseconds (output)");
-	ret = bt_util_ns_from_origin(clock_class, cycles, ns);
+	ret = bt_util_ns_from_origin_clock_class(clock_class, cycles, ns);
 	if (ret) {
+		ret = BT_CLOCK_CLASS_STATUS_OVERFLOW;
 		BT_LIB_LOGW("Cannot convert cycles to nanoseconds "
 			"from origin for given clock class: "
 			"value overflows the signed 64-bit integer range: "