Split CTF IR and CTF writer APIs and implementations

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

diff --git a/lib/ctf-ir/clock-class.c b/lib/ctf-ir/clock-class.c
index 730f8f34dab53f98f2d677a112ec89d37b79ee8f..40654e990144c9dace17d393a47828f1be9517a2 100644 (file)
--- a/lib/ctf-ir/clock-class.c
+++ b/lib/ctf-ir/clock-class.c
@@ -39,6 +39,7 @@
 #include <babeltrace/compat/string-internal.h>
 #include <inttypes.h>
 #include <babeltrace/object-internal.h>
+#include <babeltrace/assert-internal.h>
 
 static
 void bt_clock_class_destroy(struct bt_object *obj);
@@ -68,7 +69,7 @@ int bt_clock_class_set_name(struct bt_clock_class *clock_class,
        }
 
        if (!bt_identifier_is_valid(name)) {
-               BT_LOGE("Clock class's name is not a valid CTF identifier: "
+               BT_LOGW("Clock class's name is not a valid CTF identifier: "
                        "addr=%p, name=\"%s\"",
                        clock_class, name);
                ret = -1;
@@ -138,9 +139,7 @@ struct bt_clock_class *bt_clock_class_create(const char *name,
        if (name) {
                ret = bt_clock_class_set_name(clock_class, name);
                if (ret) {
-                       BT_LOGE("Cannot set clock class's name: "
-                               "addr=%p, name=\"%s\"",
-                               clock_class, name);
+                       /* bt_clock_class_set_name() logs errors */
                        goto error;
                }
        }
@@ -530,66 +529,13 @@ static uint64_t ns_from_value(uint64_t frequency, uint64_t value)
 BT_HIDDEN
 void bt_clock_class_freeze(struct bt_clock_class *clock_class)
 {
-       if (!clock_class) {
-               BT_LOGW_STR("Invalid parameter: clock class is NULL.");
-               return;
-       }
-
-       if (!clock_class->frozen) {
-               BT_LOGD("Freezing clock class: addr=%p, name=\"%s\"",
-                       clock_class, bt_clock_class_get_name(clock_class));
-               clock_class->frozen = 1;
-       }
-}
-
-BT_HIDDEN
-void bt_clock_class_serialize(struct bt_clock_class *clock_class,
-               struct metadata_context *context)
-{
-       unsigned char *uuid;
-
-       BT_LOGD("Serializing clock class's metadata: clock-class-addr=%p, "
-               "name=\"%s\", metadata-context-addr=%p", clock_class,
-               bt_clock_class_get_name(clock_class), context);
-
-       if (!clock_class || !context) {
-               BT_LOGW("Invalid parameter: clock class or metadata context is NULL: "
-                       "clock-class-addr=%p, name=\"%s\", metadata-context-addr=%p",
-                       clock_class, bt_clock_class_get_name(clock_class),
-                       context);
+       if (!clock_class || clock_class->frozen) {
                return;
        }
 
-       uuid = clock_class->uuid;
-       g_string_append(context->string, "clock {\n");
-       g_string_append_printf(context->string, "\tname = %s;\n",
-               clock_class->name->str);
-
-       if (clock_class->uuid_set) {
-               g_string_append_printf(context->string,
-                       "\tuuid = \"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\";\n",
-                       uuid[0], uuid[1], uuid[2], uuid[3],
-                       uuid[4], uuid[5], uuid[6], uuid[7],
-                       uuid[8], uuid[9], uuid[10], uuid[11],
-                       uuid[12], uuid[13], uuid[14], uuid[15]);
-       }
-
-       if (clock_class->description) {
-               g_string_append_printf(context->string, "\tdescription = \"%s\";\n",
-                       clock_class->description->str);
-       }
-
-       g_string_append_printf(context->string, "\tfreq = %" PRIu64 ";\n",
-               clock_class->frequency);
-       g_string_append_printf(context->string, "\tprecision = %" PRIu64 ";\n",
-               clock_class->precision);
-       g_string_append_printf(context->string, "\toffset_s = %" PRIu64 ";\n",
-               clock_class->offset_s);
-       g_string_append_printf(context->string, "\toffset = %" PRIu64 ";\n",
-               clock_class->offset);
-       g_string_append_printf(context->string, "\tabsolute = %s;\n",
-               clock_class->absolute ? "true" : "false");
-       g_string_append(context->string, "};\n\n");
+       BT_LOGD("Freezing clock class: addr=%p, name=\"%s\"",
+               clock_class, bt_clock_class_get_name(clock_class));
+       clock_class->frozen = 1;
 }
 
 static
@@ -668,7 +614,7 @@ void set_ns_from_epoch(struct bt_clock_value *clock_value)
        }
 
        s_ns = (int64_t) u_ns;
-       assert(s_ns >= 0);
+       BT_ASSERT(s_ns >= 0);
 
        if (clock_class->offset < 0) {
                if (clock_value->ns_from_epoch >= 0) {
@@ -731,7 +677,7 @@ offset_ok:
        }
 
        s_ns = (int64_t) u_ns;
-       assert(s_ns >= 0);
+       BT_ASSERT(s_ns >= 0);
 
        /* Clock value (cycles) is always positive */
        if (clock_value->ns_from_epoch <= 0) {
@@ -865,8 +811,8 @@ int bt_clock_class_compare(struct bt_clock_class *clock_class_a,
                struct bt_clock_class *clock_class_b)
 {
        int ret = 1;
-       assert(clock_class_a);
-       assert(clock_class_b);
+       BT_ASSERT(clock_class_a);
+       BT_ASSERT(clock_class_b);
 
        /* Name */
        if (strcmp(clock_class_a->name->str, clock_class_b->name->str) != 0) {