X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fclock-snapshot.c;h=cbce39c14e022f90fd93c74473f719dc314dba77;hb=98b15851a941e7342b8bb19e265cdc3a40fabfb8;hp=53f6be654478454fb051468c4e5cbfd75b33278d;hpb=870631a2db01676b476dbee615aade0a22926bcd;p=babeltrace.git

diff --git a/src/lib/trace-ir/clock-snapshot.c b/src/lib/trace-ir/clock-snapshot.c
index 53f6be65..cbce39c1 100644
--- a/src/lib/trace-ir/clock-snapshot.c
+++ b/src/lib/trace-ir/clock-snapshot.c
@@ -24,7 +24,7 @@
 #include "lib/logging.h"
 
 #include "lib/assert-pre.h"
-#include "compat/uuid.h"
+#include "common/uuid.h"
 #include "clock-class.h"
 #include "clock-snapshot.h"
 #include <babeltrace2/trace-ir/clock-snapshot-const.h>
@@ -39,6 +39,7 @@
 BT_HIDDEN
 void bt_clock_snapshot_destroy(struct bt_clock_snapshot *clock_snapshot)
 {
+	BT_ASSERT(clock_snapshot);
 	BT_LIB_LOGD("Destroying clock snapshot: %!+k", clock_snapshot);
 	BT_OBJECT_PUT_REF_AND_RESET(clock_snapshot->clock_class);
 	g_free(clock_snapshot);
@@ -62,7 +63,7 @@ struct bt_clock_snapshot *bt_clock_snapshot_new(
 
 	bt_object_init_unique(&ret->base);
 	ret->clock_class = clock_class;
-	bt_object_get_no_null_check(clock_class);
+	bt_object_get_ref_no_null_check(clock_class);
 	bt_clock_class_freeze(clock_class);
 	BT_LIB_LOGD("Created clock snapshot object: %!+k", ret);
 
@@ -76,26 +77,18 @@ struct bt_clock_snapshot *bt_clock_snapshot_create(
 {
 	struct bt_clock_snapshot *clock_snapshot = NULL;
 
-	BT_ASSERT(clock_class);
+	BT_ASSERT_DBG(clock_class);
 	clock_snapshot = bt_object_pool_create_object(&clock_class->cs_pool);
 	if (!clock_snapshot) {
 		BT_LIB_LOGE_APPEND_CAUSE(
 			"Cannot allocate one clock snapshot from clock class's clock snapshot pool: "
 			"%![cc-]+K", clock_class);
-		goto error;
+		goto end;
 	}
 
 	if (G_LIKELY(!clock_snapshot->clock_class)) {
 		clock_snapshot->clock_class = clock_class;
-		bt_object_get_no_null_check(clock_class);
-	}
-
-	goto end;
-
-error:
-	if (clock_snapshot) {
-		bt_clock_snapshot_recycle(clock_snapshot);
-		clock_snapshot = NULL;
+		bt_object_get_ref_no_null_check(clock_class);
 	}
 
 end:
@@ -107,7 +100,7 @@ void bt_clock_snapshot_recycle(struct bt_clock_snapshot *clock_snapshot)
 {
 	struct bt_clock_class *clock_class;
 
-	BT_ASSERT(clock_snapshot);
+	BT_ASSERT_DBG(clock_snapshot);
 	BT_LIB_LOGD("Recycling clock snapshot: %!+k", clock_snapshot);
 
 	/*
@@ -134,7 +127,7 @@ void bt_clock_snapshot_recycle(struct bt_clock_snapshot *clock_snapshot)
 	 */
 	bt_clock_snapshot_reset(clock_snapshot);
 	clock_class = clock_snapshot->clock_class;
-	BT_ASSERT(clock_class);
+	BT_ASSERT_DBG(clock_class);
 	clock_snapshot->clock_class = NULL;
 	bt_object_pool_recycle_object(&clock_class->cs_pool, clock_snapshot);
 	bt_object_put_ref(clock_class);
@@ -143,8 +136,8 @@ void bt_clock_snapshot_recycle(struct bt_clock_snapshot *clock_snapshot)
 uint64_t bt_clock_snapshot_get_value(
 		const struct bt_clock_snapshot *clock_snapshot)
 {
-	BT_ASSERT_PRE_NON_NULL(clock_snapshot, "Clock snapshot");
-	BT_ASSERT_PRE(clock_snapshot->is_set,
+	BT_ASSERT_PRE_DEV_NON_NULL(clock_snapshot, "Clock snapshot");
+	BT_ASSERT_PRE_DEV(clock_snapshot->is_set,
 		"Clock snapshot is not set: %!+k", clock_snapshot);
 	return clock_snapshot->value_cycles;
 }
@@ -156,16 +149,17 @@ bt_clock_snapshot_get_ns_from_origin(
 {
 	int ret = BT_FUNC_STATUS_OK;
 
-	BT_ASSERT_PRE_NON_NULL(clock_snapshot, "Clock snapshot");
-	BT_ASSERT_PRE_NON_NULL(ret_value_ns, "Value (ns) (output)");
-	BT_ASSERT_PRE(clock_snapshot->is_set,
+	BT_ASSERT_PRE_DEV_NON_NULL(clock_snapshot, "Clock snapshot");
+	BT_ASSERT_PRE_DEV_NON_NULL(ret_value_ns, "Value (ns) (output)");
+	BT_ASSERT_PRE_DEV(clock_snapshot->is_set,
 		"Clock snapshot is not set: %!+k", clock_snapshot);
 
 	if (clock_snapshot->ns_from_origin_overflows) {
-		BT_LIB_LOGD("Clock snapshot, once converted to nanoseconds from origin, "
+		BT_LIB_LOGE_APPEND_CAUSE(
+			"Clock snapshot, once converted to nanoseconds from origin, "
 			"overflows the signed 64-bit integer range: "
 			"%![cs-]+k", clock_snapshot);
-		ret = BT_FUNC_STATUS_OVERFLOW;
+		ret = BT_FUNC_STATUS_OVERFLOW_ERROR;
 		goto end;
 	}
 
@@ -178,6 +172,6 @@ end:
 const struct bt_clock_class *bt_clock_snapshot_borrow_clock_class_const(
 		const struct bt_clock_snapshot *clock_snapshot)
 {
-	BT_ASSERT_PRE_NON_NULL(clock_snapshot, "Clock snapshot");
+	BT_ASSERT_PRE_DEV_NON_NULL(clock_snapshot, "Clock snapshot");
 	return clock_snapshot->clock_class;
 }