Clock class API: use status

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

diff --git a/lib/trace-ir/clock-class.c b/lib/trace-ir/clock-class.c
index fd82342ff9d689de3034e21c7c0333cc29ef8a92..273d8f58a544d39b788fb5f7e9750066091bc910 100644 (file)
--- a/lib/trace-ir/clock-class.c
+++ b/lib/trace-ir/clock-class.c
@@ -26,10 +26,11 @@
 
 #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-value-internal.h>
+#include <babeltrace/trace-ir/clock-snapshot-internal.h>
 #include <babeltrace/trace-ir/utils-internal.h>
-#include <babeltrace/object.h>
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/types.h>
 #include <babeltrace/compat/string-internal.h>
@@ -59,15 +60,15 @@ void destroy_clock_class(struct bt_object *obj)
                clock_class->description.value = NULL;
        }
 
-       bt_object_pool_finalize(&clock_class->cv_pool);
+       bt_object_pool_finalize(&clock_class->cs_pool);
        g_free(clock_class);
 }
 
 static
-void free_clock_value(struct bt_clock_value *clock_value,
+void free_clock_snapshot(struct bt_clock_snapshot *clock_snapshot,
                struct bt_clock_class *clock_class)
 {
-       bt_clock_value_destroy(clock_value);
+       bt_clock_snapshot_destroy(clock_snapshot);
 }
 
 static inline
@@ -134,13 +135,13 @@ struct bt_clock_class *bt_clock_class_create(void)
        clock_class->frequency = UINT64_C(1000000000);
        clock_class->is_absolute = BT_TRUE;
        set_base_offset(clock_class);
-       ret = bt_object_pool_initialize(&clock_class->cv_pool,
-               (bt_object_pool_new_object_func) bt_clock_value_new,
+       ret = bt_object_pool_initialize(&clock_class->cs_pool,
+               (bt_object_pool_new_object_func) bt_clock_snapshot_new,
                (bt_object_pool_destroy_object_func)
-                       free_clock_value,
+                       free_clock_snapshot,
                clock_class);
        if (ret) {
-               BT_LOGE("Failed to initialize clock value pool: ret=%d",
+               BT_LOGE("Failed to initialize clock snapshot pool: ret=%d",
                        ret);
                goto error;
        }
@@ -161,8 +162,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");
@@ -170,7 +171,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(
@@ -180,8 +181,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");
@@ -190,7 +191,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)
@@ -303,7 +304,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)
 {
@@ -313,6 +314,7 @@ int bt_clock_class_cycles_to_ns_from_origin(
        BT_ASSERT_PRE_NON_NULL(ns, "Nanoseconds (output)");
        ret = bt_util_ns_from_origin(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: "
@@ -322,3 +324,13 @@ int bt_clock_class_cycles_to_ns_from_origin(
 
        return ret;
 }
+
+void bt_clock_class_get_ref(const struct bt_clock_class *clock_class)
+{
+       bt_object_get_ref(clock_class);
+}
+
+void bt_clock_class_put_ref(const struct bt_clock_class *clock_class)
+{
+       bt_object_put_ref(clock_class);
+}