Print timestamps in text plug-in

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

diff --git a/formats/ctf/ir/clock.c b/formats/ctf/ir/clock.c
index 2e765430f66d8ad590e8dfbff01777fc62a3963f..4eed39c718a42a6f67e37883d89929709e95814a 100644 (file)
--- a/formats/ctf/ir/clock.c
+++ b/formats/ctf/ir/clock.c
@@ -38,28 +38,21 @@ static
 void bt_ctf_clock_destroy(struct bt_object *obj);
 
 BT_HIDDEN
-struct bt_ctf_clock *_bt_ctf_clock_create(void)
+bool bt_ctf_clock_is_valid(struct bt_ctf_clock *clock)
 {
-       struct bt_ctf_clock *clock = g_new0(
-               struct bt_ctf_clock, 1);
-
-       if (!clock) {
-               goto end;
-       }
-
-       clock->precision = 1;
-       clock->frequency = 1000000000;
-       bt_object_init(clock, bt_ctf_clock_destroy);
-end:
-       return clock;
+       return clock && clock->name;
 }
 
-BT_HIDDEN
 int bt_ctf_clock_set_name(struct bt_ctf_clock *clock,
                const char *name)
 {
        int ret = 0;
 
+       if (!clock || clock->frozen) {
+               ret = -1;
+               goto end;
+       }
+
        if (bt_ctf_validate_identifier(name)) {
                ret = -1;
                goto end;
@@ -82,16 +75,21 @@ end:
 struct bt_ctf_clock *bt_ctf_clock_create(const char *name)
 {
        int ret;
-       struct bt_ctf_clock *clock = NULL;
+       struct bt_ctf_clock *clock = g_new0(struct bt_ctf_clock, 1);
 
-       clock = _bt_ctf_clock_create();
        if (!clock) {
                goto error;
        }
 
-       ret = bt_ctf_clock_set_name(clock, name);
-       if (ret) {
-               goto error;
+       clock->precision = 1;
+       clock->frequency = 1000000000;
+       bt_object_init(clock, bt_ctf_clock_destroy);
+
+       if (name) {
+               ret = bt_ctf_clock_set_name(clock, name);
+               if (ret) {
+                       goto error;
+               }
        }
 
        ret = bt_uuid_generate(clock->uuid);
@@ -325,39 +323,23 @@ end:
        return ret;
 }
 
-int bt_ctf_clock_get_time(struct bt_ctf_clock *clock, int64_t *time)
+uint64_t ns_from_value(uint64_t frequency, uint64_t value)
 {
-       int ret = 0;
-
-       if (!clock || !time) {
-               ret = -1;
-               goto end;
-       }
-
-
-       if (!clock->has_value) {
-               /*
-                * Clock belongs to a non-writer mode trace and thus
-                * this function is disabled.
-                */
-               goto end;
-       }
+       uint64_t ns;
 
-       /* Common case where cycles are actually nanoseconds */
-       if (clock->frequency == 1000000000) {
-               *time = (int64_t) clock->value;
+       if (frequency == 1000000000) {
+               ns = value;
        } else {
-               *time = (int64_t) ((1e9 * (double) clock->value) /
-                       (double) clock->frequency);
+               ns = (uint64_t) ((1e9 * (double) value) / (double) frequency);
        }
 
-end:
-       return ret;
+       return ns;
 }
 
 int bt_ctf_clock_set_time(struct bt_ctf_clock *clock, int64_t time)
 {
        int ret = 0;
+       int64_t value;
 
        /* Timestamps are strictly monotonic */
        if (!clock) {
@@ -377,58 +359,14 @@ int bt_ctf_clock_set_time(struct bt_ctf_clock *clock, int64_t time)
 
        /* Common case where cycles are actually nanoseconds */
        if (clock->frequency == 1000000000) {
-               clock->value = time;
-               goto end;
-       }
-
-       ret = bt_ctf_clock_set_value(clock,
-               (uint64_t) (((double) time * (double) clock->frequency) / 1e9));
-
-end:
-       return ret;
-}
-
-uint64_t bt_ctf_clock_get_value(struct bt_ctf_clock *clock)
-{
-       uint64_t ret = -1ULL;
-
-       if (!clock) {
-               goto end;
-       }
-
-       if (!clock->has_value) {
-               /*
-                * Clock belongs to a non-writer mode trace and thus
-                * this function is disabled.
-                */
-               goto end;
-       }
-
-       ret = clock->value;
-end:
-       return ret;
-}
-
-int bt_ctf_clock_set_value(struct bt_ctf_clock *clock, uint64_t value)
-{
-       int ret = 0;
-
-       if (!clock) {
-               ret = -1;
-               goto end;
-       }
-
-       if (!clock->has_value) {
-               /*
-                * Clock belongs to a non-writer mode trace and thus
-                * this function is disabled.
-                */
-               ret = -1;
-               goto end;
+               value = time;
+       } else {
+               value = (uint64_t) (((double) time *
+                       (double) clock->frequency) / 1e9);
        }
 
-       /* Timestamps are strictly monotonic */
-       if (value < clock->value) {
+       if (clock->value > value) {
+               /* Timestamps must be strictly monotonic. */
                ret = -1;
                goto end;
        }
@@ -512,3 +450,79 @@ void bt_ctf_clock_destroy(struct bt_object *obj)
 
        g_free(clock);
 }
+
+static
+void bt_ctf_clock_value_destroy(struct bt_object *obj)
+{
+       struct bt_ctf_clock_value *value;
+
+       if (!obj) {
+               return;
+       }
+
+       value = container_of(obj, struct bt_ctf_clock_value, base);
+       bt_put(value->clock_class);
+       g_free(value);
+}
+
+struct bt_ctf_clock_value *bt_ctf_clock_value_create(
+               struct bt_ctf_clock *clock, uint64_t value)
+{
+       struct bt_ctf_clock_value *ret = NULL;
+
+       if (!clock) {
+               goto end;
+       }
+
+       ret = g_new0(struct bt_ctf_clock_value, 1);
+       if (!ret) {
+               goto end;
+       }
+
+       bt_object_init(ret, bt_ctf_clock_value_destroy);
+       ret->clock_class = bt_get(clock);
+       ret->value = value;
+end:
+       return ret;
+}
+
+int bt_ctf_clock_value_get_value(
+               struct bt_ctf_clock_value *clock_value, uint64_t *raw_value)
+{
+       int ret = 0;
+
+       if (!clock_value || !raw_value) {
+               ret = -1;
+               goto end;
+       }
+
+       *raw_value = clock_value->value;
+end:
+       return ret;
+}
+
+int bt_ctf_clock_value_get_value_ns_from_epoch(struct bt_ctf_clock_value *value,
+               int64_t *ret_value_ns)
+{
+       int ret = 0;
+       int64_t ns;
+
+       if (!value || !ret_value_ns) {
+               ret = -1;
+               goto end;
+       }
+
+       /* Initialize nanosecond timestamp to clock's offset in seconds. */
+       ns = value->clock_class->offset_s * 1000000000;
+
+       /* Add offset in cycles, converted to nanoseconds. */
+       ns += ns_from_value(value->clock_class->frequency,
+                       value->clock_class->offset);
+
+       /* Add given value, converter to nanoseconds. */
+       ns += ns_from_value(value->clock_class->frequency, value->value);
+
+       *ret_value_ns = ns;
+end:
+       return ret;
+}