Reuse existing g_string instance when setting a clock name

[babeltrace.git] / formats / ctf / ir / clock.c

diff --git a/formats/ctf/ir/clock.c b/formats/ctf/ir/clock.c
index 2a55857f0b76fb405fabcd465b9d80534ddf31c2..45ed14762512d72dd5cd4b23ca396da7140e6907 100644 (file)
--- a/formats/ctf/ir/clock.c
+++ b/formats/ctf/ir/clock.c
@@ -1,7 +1,7 @@
 /*
  * clock.c
  *
- * Babeltrace CTF Writer
+ * Babeltrace CTF IR - Clock
  *
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
@@ -26,7 +26,6 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ctf-writer/clock.h>
 #include <babeltrace/ctf-ir/clock-internal.h>
 #include <babeltrace/ctf-writer/writer-internal.h>
 #include <babeltrace/compiler.h>
@@ -35,28 +34,69 @@
 static
 void bt_ctf_clock_destroy(struct bt_ctf_ref *ref);
 
-struct bt_ctf_clock *bt_ctf_clock_create(const char *name)
+BT_HIDDEN
+struct bt_ctf_clock *_bt_ctf_clock_create(void)
 {
-       struct bt_ctf_clock *clock = NULL;
+       struct bt_ctf_clock *clock = g_new0(
+               struct bt_ctf_clock, 1);
+
+       if (!clock) {
+               goto end;
+       }
+
+       clock->precision = 1;
+       clock->frequency = 1000000000;
+       bt_ctf_ref_init(&clock->ref_count);
+end:
+       return clock;
+}
+
+BT_HIDDEN
+int bt_ctf_clock_set_name(struct bt_ctf_clock *clock,
+               const char *name)
+{
+       int ret = 0;
 
        if (validate_identifier(name)) {
-               goto error;
+               ret = -1;
+               goto end;
+       }
+
+       if (clock->name) {
+               g_string_assign(clock->name, name);
+       } else {
+               clock->name = g_string_new(name);
+               if (!clock->name) {
+                       ret = -1;
+                       goto end;
+               }
        }
 
-       clock = g_new0(struct bt_ctf_clock, 1);
+end:
+       return ret;
+}
+
+struct bt_ctf_clock *bt_ctf_clock_create(const char *name)
+{
+       int ret;
+       struct bt_ctf_clock *clock = NULL;
+
+       clock = _bt_ctf_clock_create();
        if (!clock) {
                goto error;
        }
 
-       clock->name = g_string_new(name);
-       if (!clock->name) {
+       ret = bt_ctf_clock_set_name(clock, name);
+       if (ret) {
                goto error_destroy;
        }
 
-       clock->precision = 1;
-       clock->frequency = 1000000000;
-       uuid_generate(clock->uuid);
-       bt_ctf_ref_init(&clock->ref_count);
+       ret = babeltrace_uuid_generate(clock->uuid);
+       if (ret) {
+               goto error_destroy;
+       }
+
+       clock->uuid_set = 1;
        return clock;
 error_destroy:
        bt_ctf_clock_destroy(&clock->ref_count);
@@ -245,6 +285,35 @@ end:
        return ret;
 }
 
+const unsigned char *bt_ctf_clock_get_uuid(struct bt_ctf_clock *clock)
+{
+       const unsigned char *ret;
+
+       if (!clock || !clock->uuid_set) {
+               ret = NULL;
+               goto end;
+       }
+
+       ret = clock->uuid;
+end:
+       return ret;
+}
+
+int bt_ctf_clock_set_uuid(struct bt_ctf_clock *clock, const unsigned char *uuid)
+{
+       int ret = 0;
+
+       if (!clock || !uuid || clock->frozen) {
+               ret = -1;
+               goto end;
+       }
+
+       memcpy(clock->uuid, uuid, sizeof(uuid_t));
+       clock->uuid_set = 1;
+end:
+       return ret;
+}
+
 uint64_t bt_ctf_clock_get_time(struct bt_ctf_clock *clock)
 {
        uint64_t ret = -1ULL;