lib: rename all `*_STATUS_OVERFLOW` -> `*_STATUS_OVERFLOW_ERROR`

[babeltrace.git] / src / lib / trace-ir / clock-snapshot.c

diff --git a/src/lib/trace-ir/clock-snapshot.c b/src/lib/trace-ir/clock-snapshot.c
index 757e1cb8101d4cea685dc8f2b24f416789258c78..899d0083dba106ff0fa6c993ed6d21b5f63dde27 100644 (file)
--- 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);
@@ -55,7 +56,8 @@ struct bt_clock_snapshot *bt_clock_snapshot_new(
                clock_class);
        ret = g_new0(struct bt_clock_snapshot, 1);
        if (!ret) {
-               BT_LOGE_STR("Failed to allocate one clock snapshot.");
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Failed to allocate one clock snapshot.");
                goto end;
        }
 
@@ -78,7 +80,8 @@ struct bt_clock_snapshot *bt_clock_snapshot_create(
        BT_ASSERT(clock_class);
        clock_snapshot = bt_object_pool_create_object(&clock_class->cs_pool);
        if (!clock_snapshot) {
-               BT_LIB_LOGE("Cannot allocate one clock snapshot from clock class's clock snapshot pool: "
+               BT_LIB_LOGE_APPEND_CAUSE(
+                       "Cannot allocate one clock snapshot from clock class's clock snapshot pool: "
                        "%![cc-]+K", clock_class);
                goto error;
        }
@@ -141,8 +144,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;
 }
@@ -154,16 +157,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;
        }
 
@@ -176,6 +180,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;
 }