lib: make trace IR API const-correct

[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 d77b121a568d88fe0243acbc44a2701f66d6339b..4ab90d24cdb9c761659720bdcdde9fa9c404d2a9 100644 (file)
--- a/lib/trace-ir/clock-class.c
+++ b/lib/trace-ir/clock-class.c
@@ -50,10 +50,14 @@ void destroy_clock_class(struct bt_object *obj)
 
        if (clock_class->name.str) {
                g_string_free(clock_class->name.str, TRUE);
+               clock_class->name.str = NULL;
+               clock_class->name.value = NULL;
        }
 
        if (clock_class->description.str) {
                g_string_free(clock_class->description.str, TRUE);
+               clock_class->description.str = NULL;
+               clock_class->description.value = NULL;
        }
 
        bt_object_pool_finalize(&clock_class->cv_pool);
@@ -102,7 +106,7 @@ end:
        return;
 }
 
-struct bt_private_clock_class *bt_private_clock_class_create(void)
+struct bt_clock_class *bt_clock_class_create(void)
 {
        int ret;
        struct bt_clock_class *clock_class = NULL;
@@ -149,22 +153,18 @@ error:
        BT_OBJECT_PUT_REF_AND_RESET(clock_class);
 
 end:
-       return (void *) clock_class;
+       return clock_class;
 }
 
-const char *bt_clock_class_get_name(
-               struct bt_clock_class *clock_class)
+const char *bt_clock_class_get_name(const struct bt_clock_class *clock_class)
 {
        BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
        return clock_class->name.value;
 }
 
-int bt_private_clock_class_set_name(
-               struct bt_private_clock_class *priv_clock_class,
+int bt_clock_class_set_name(struct bt_clock_class *clock_class,
                const char *name)
 {
-       struct bt_clock_class *clock_class = (void *) priv_clock_class;
-
        BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
        BT_ASSERT_PRE_NON_NULL(name, "Name");
        BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
@@ -174,18 +174,16 @@ int bt_private_clock_class_set_name(
        return 0;
 }
 
-const char *bt_clock_class_get_description(struct bt_clock_class *clock_class)
+const char *bt_clock_class_get_description(
+               const struct bt_clock_class *clock_class)
 {
        BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
        return clock_class->description.value;
 }
 
-int bt_private_clock_class_set_description(
-               struct bt_private_clock_class *priv_clock_class,
+int bt_clock_class_set_description(struct bt_clock_class *clock_class,
                const char *descr)
 {
-       struct bt_clock_class *clock_class = (void *) priv_clock_class;
-
        BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
        BT_ASSERT_PRE_NON_NULL(descr, "Description");
        BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
@@ -196,18 +194,15 @@ int bt_private_clock_class_set_description(
        return 0;
 }
 
-uint64_t bt_clock_class_get_frequency(struct bt_clock_class *clock_class)
+uint64_t bt_clock_class_get_frequency(const struct bt_clock_class *clock_class)
 {
        BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
        return clock_class->frequency;
 }
 
-int bt_private_clock_class_set_frequency(
-               struct bt_private_clock_class *priv_clock_class,
+void bt_clock_class_set_frequency(struct bt_clock_class *clock_class,
                uint64_t frequency)
 {
-       struct bt_clock_class *clock_class = (void *) priv_clock_class;
-
        BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
        BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
        BT_ASSERT_PRE(frequency != UINT64_C(-1) && frequency != 0,
@@ -219,21 +214,17 @@ int bt_private_clock_class_set_frequency(
        clock_class->frequency = frequency;
        set_base_offset(clock_class);
        BT_LIB_LOGV("Set clock class's frequency: %!+K", clock_class);
-       return 0;
 }
 
-uint64_t bt_clock_class_get_precision(struct bt_clock_class *clock_class)
+uint64_t bt_clock_class_get_precision(const struct bt_clock_class *clock_class)
 {
        BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
        return clock_class->precision;
 }
 
-int bt_private_clock_class_set_precision(
-               struct bt_private_clock_class *priv_clock_class,
+void bt_clock_class_set_precision(struct bt_clock_class *clock_class,
                uint64_t precision)
 {
-       struct bt_clock_class *clock_class = (void *) priv_clock_class;
-
        BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
        BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
        BT_ASSERT_PRE(precision != UINT64_C(-1),
@@ -241,10 +232,9 @@ int bt_private_clock_class_set_precision(
                clock_class, precision);
        clock_class->precision = precision;
        BT_LIB_LOGV("Set clock class's precision: %!+K", clock_class);
-       return 0;
 }
 
-void bt_clock_class_get_offset(struct bt_clock_class *clock_class,
+void bt_clock_class_get_offset(const struct bt_clock_class *clock_class,
                int64_t *seconds, uint64_t *cycles)
 {
        BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
@@ -254,12 +244,9 @@ void bt_clock_class_get_offset(struct bt_clock_class *clock_class,
        *cycles = clock_class->offset_cycles;
 }
 
-int bt_private_clock_class_set_offset(
-               struct bt_private_clock_class *priv_clock_class,
+void bt_clock_class_set_offset(struct bt_clock_class *clock_class,
                int64_t seconds, uint64_t cycles)
 {
-       struct bt_clock_class *clock_class = (void *) priv_clock_class;
-
        BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
        BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
        BT_ASSERT_PRE(cycles < clock_class->frequency,
@@ -269,52 +256,43 @@ int bt_private_clock_class_set_offset(
        clock_class->offset_cycles = cycles;
        set_base_offset(clock_class);
        BT_LIB_LOGV("Set clock class's offset: %!+K", clock_class);
-       return 0;
 }
 
-bt_bool bt_clock_class_is_absolute(struct bt_clock_class *clock_class)
+bt_bool bt_clock_class_is_absolute(const struct bt_clock_class *clock_class)
 {
        BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
        return (bool) clock_class->is_absolute;
 }
 
-int bt_private_clock_class_set_is_absolute(
-               struct bt_private_clock_class *priv_clock_class,
+void bt_clock_class_set_is_absolute(struct bt_clock_class *clock_class,
                bt_bool is_absolute)
 {
-       struct bt_clock_class *clock_class = (void *) priv_clock_class;
-
        BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
        BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
        clock_class->is_absolute = (bool) is_absolute;
        BT_LIB_LOGV("Set clock class's absolute property: %!+K",
                clock_class);
-       return 0;
 }
 
-bt_uuid bt_clock_class_get_uuid(struct bt_clock_class *clock_class)
+bt_uuid bt_clock_class_get_uuid(const struct bt_clock_class *clock_class)
 {
        BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
        return clock_class->uuid.value;
 }
 
-int bt_private_clock_class_set_uuid(
-               struct bt_private_clock_class *priv_clock_class,
+void bt_clock_class_set_uuid(struct bt_clock_class *clock_class,
                bt_uuid uuid)
 {
-       struct bt_clock_class *clock_class = (void *) priv_clock_class;
-
        BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
        BT_ASSERT_PRE_NON_NULL(uuid, "UUID");
        BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
        memcpy(clock_class->uuid.uuid, uuid, BABELTRACE_UUID_LEN);
        clock_class->uuid.value = clock_class->uuid.uuid;
        BT_LIB_LOGV("Set clock class's UUID: %!+K", clock_class);
-       return 0;
 }
 
 BT_HIDDEN
-void _bt_clock_class_freeze(struct bt_clock_class *clock_class)
+void _bt_clock_class_freeze(const struct bt_clock_class *clock_class)
 {
        BT_ASSERT(clock_class);
 
@@ -323,10 +301,11 @@ void _bt_clock_class_freeze(struct bt_clock_class *clock_class)
        }
 
        BT_LIB_LOGD("Freezing clock class: %!+K", clock_class);
-       clock_class->frozen = 1;
+       ((struct bt_clock_class *) clock_class)->frozen = 1;
 }
 
-int bt_clock_class_cycles_to_ns_from_origin(struct bt_clock_class *clock_class,
+int bt_clock_class_cycles_to_ns_from_origin(
+               const struct bt_clock_class *clock_class,
                uint64_t cycles, int64_t *ns)
 {
        int ret;
@@ -344,9 +323,3 @@ int bt_clock_class_cycles_to_ns_from_origin(struct bt_clock_class *clock_class,
 
        return ret;
 }
-
-struct bt_clock_class *bt_clock_class_borrow_from_private(
-               struct bt_private_clock_class *priv_clock_class)
-{
-       return (void *) priv_clock_class;
-}