lib: use BT_LIB_LOG*_APPEND_CAUSE() where appropriate

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

diff --git a/src/lib/trace-ir/clock-class.c b/src/lib/trace-ir/clock-class.c
index dd78c8c938bb184649b85f4236430394bcb173af..43341d0f963561a77970c3724cf0169b95186b09 100644 (file)
--- a/src/lib/trace-ir/clock-class.c
+++ b/src/lib/trace-ir/clock-class.c
@@ -22,7 +22,7 @@
  */
 
 #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"
@@ -37,6 +37,7 @@
 #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))
@@ -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;
        }
@@ -136,7 +138,7 @@ const char *bt_clock_class_get_name(const struct bt_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");
@@ -145,7 +147,7 @@ enum bt_clock_class_status bt_clock_class_set_name(
        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(
@@ -155,7 +157,7 @@ const char *bt_clock_class_get_description(
        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");
@@ -165,7 +167,7 @@ enum bt_clock_class_status bt_clock_class_set_description(
        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)
@@ -278,7 +280,8 @@ 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)
 {
@@ -288,7 +291,7 @@ enum bt_clock_class_status bt_clock_class_cycles_to_ns_from_origin(
        BT_ASSERT_PRE_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;
+               ret = BT_FUNC_STATUS_OVERFLOW;
                BT_LIB_LOGD("Cannot convert cycles to nanoseconds "
                        "from origin for given clock class: "
                        "value overflows the signed 64-bit integer range: "