From 5552377ac6051ce8ff79fc44c446a23b13f265a8 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 20 Feb 2019 14:30:50 -0500 Subject: [PATCH] lib: rename clock class's absolute property to "origin is Unix epoch" This is simply straightforward and describes precisely what the absolute property used to mean. Signed-off-by: Philippe Proulx --- include/babeltrace/trace-ir/clock-class-const.h | 2 +- include/babeltrace/trace-ir/clock-class-internal.h | 2 +- include/babeltrace/trace-ir/clock-class.h | 4 ++-- lib/lib-logging.c | 4 ++-- lib/trace-ir/clock-class.c | 14 +++++++------- plugins/ctf/common/metadata/ctf-meta-translate.c | 2 +- plugins/libctfcopytrace/ctfcopytrace.c | 4 ++-- plugins/text/dmesg/dmesg.c | 6 +++--- plugins/utils/muxer/muxer.c | 8 ++++---- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/babeltrace/trace-ir/clock-class-const.h b/include/babeltrace/trace-ir/clock-class-const.h index d609770d..ab9cd54a 100644 --- a/include/babeltrace/trace-ir/clock-class-const.h +++ b/include/babeltrace/trace-ir/clock-class-const.h @@ -57,7 +57,7 @@ extern uint64_t bt_clock_class_get_precision( extern void bt_clock_class_get_offset(const bt_clock_class *clock_class, int64_t *seconds, uint64_t *cycles); -extern bt_bool bt_clock_class_is_absolute( +extern bt_bool bt_clock_class_origin_is_unix_epoch( const bt_clock_class *clock_class); extern bt_uuid bt_clock_class_get_uuid( diff --git a/include/babeltrace/trace-ir/clock-class-internal.h b/include/babeltrace/trace-ir/clock-class-internal.h index 236d70b4..d91d549f 100644 --- a/include/babeltrace/trace-ir/clock-class-internal.h +++ b/include/babeltrace/trace-ir/clock-class-internal.h @@ -64,7 +64,7 @@ struct bt_clock_class { bt_uuid value; } uuid; - bool is_absolute; + bool origin_is_unix_epoch; /* * This is computed every time you call diff --git a/include/babeltrace/trace-ir/clock-class.h b/include/babeltrace/trace-ir/clock-class.h index d5c67742..544288cd 100644 --- a/include/babeltrace/trace-ir/clock-class.h +++ b/include/babeltrace/trace-ir/clock-class.h @@ -56,8 +56,8 @@ extern void bt_clock_class_set_precision(bt_clock_class *clock_class, extern void bt_clock_class_set_offset(bt_clock_class *clock_class, int64_t seconds, uint64_t cycles); -extern void bt_clock_class_set_is_absolute(bt_clock_class *clock_class, - bt_bool is_absolute); +extern void bt_clock_class_set_origin_is_unix_epoch(bt_clock_class *clock_class, + bt_bool origin_is_unix_epoch); extern void bt_clock_class_set_uuid(bt_clock_class *clock_class, bt_uuid uuid); diff --git a/lib/lib-logging.c b/lib/lib-logging.c index a71bbefc..daee2a00 100644 --- a/lib/lib-logging.c +++ b/lib/lib-logging.c @@ -756,12 +756,12 @@ static inline void format_clock_class(char **buf_ch, bool extended, BUF_APPEND(", %sis-frozen=%d, %sprecision=%" PRIu64 ", " "%soffset-s=%" PRId64 ", " - "%soffset-cycles=%" PRIu64 ", %sis-absolute=%d, " + "%soffset-cycles=%" PRIu64 ", %sorigin-is-unix-epoch=%d, " "%sbase-offset-ns=%" PRId64, PRFIELD(clock_class->frozen), PRFIELD(clock_class->precision), PRFIELD(clock_class->offset_seconds), PRFIELD(clock_class->offset_cycles), - PRFIELD(clock_class->is_absolute), + PRFIELD(clock_class->origin_is_unix_epoch), PRFIELD(clock_class->base_offset.value_ns)); SET_TMP_PREFIX("cs-pool-"); diff --git a/lib/trace-ir/clock-class.c b/lib/trace-ir/clock-class.c index f21518e6..7f87e57b 100644 --- a/lib/trace-ir/clock-class.c +++ b/lib/trace-ir/clock-class.c @@ -107,7 +107,7 @@ struct bt_clock_class *bt_clock_class_create(bt_trace_class *trace_class) } clock_class->frequency = UINT64_C(1000000000); - clock_class->is_absolute = BT_TRUE; + clock_class->origin_is_unix_epoch = BT_TRUE; set_base_offset(clock_class); ret = bt_object_pool_initialize(&clock_class->cs_pool, (bt_object_pool_new_object_func) bt_clock_snapshot_new, @@ -232,19 +232,19 @@ void bt_clock_class_set_offset(struct bt_clock_class *clock_class, BT_LIB_LOGV("Set clock class's offset: %!+K", clock_class); } -bt_bool bt_clock_class_is_absolute(const struct bt_clock_class *clock_class) +bt_bool bt_clock_class_origin_is_unix_epoch(const struct bt_clock_class *clock_class) { BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class"); - return (bool) clock_class->is_absolute; + return (bool) clock_class->origin_is_unix_epoch; } -void bt_clock_class_set_is_absolute(struct bt_clock_class *clock_class, - bt_bool is_absolute) +void bt_clock_class_set_origin_is_unix_epoch(struct bt_clock_class *clock_class, + bt_bool origin_is_unix_epoch) { 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->origin_is_unix_epoch = (bool) origin_is_unix_epoch; + BT_LIB_LOGV("Set clock class's origin is Unix epoch property: %!+K", clock_class); } diff --git a/plugins/ctf/common/metadata/ctf-meta-translate.c b/plugins/ctf/common/metadata/ctf-meta-translate.c index cb0c80f7..9a598622 100644 --- a/plugins/ctf/common/metadata/ctf-meta-translate.c +++ b/plugins/ctf/common/metadata/ctf-meta-translate.c @@ -533,7 +533,7 @@ void ctf_clock_class_to_ir(bt_clock_class *ir_cc, struct ctf_clock_class *cc) bt_clock_class_set_uuid(ir_cc, cc->uuid); } - bt_clock_class_set_is_absolute(ir_cc, cc->is_absolute); + bt_clock_class_set_origin_is_unix_epoch(ir_cc, cc->is_absolute); } static inline diff --git a/plugins/libctfcopytrace/ctfcopytrace.c b/plugins/libctfcopytrace/ctfcopytrace.c index b833fcda..a65b0503 100644 --- a/plugins/libctfcopytrace/ctfcopytrace.c +++ b/plugins/libctfcopytrace/ctfcopytrace.c @@ -83,10 +83,10 @@ const bt_clock_class *ctf_copy_clock_class(FILE *err, int_ret = bt_clock_class_set_offset_cycles(writer_clock_class, offset); BT_ASSERT(!int_ret); - int_ret = bt_clock_class_is_absolute(clock_class); + int_ret = bt_clock_class_origin_is_unix_epoch(clock_class); BT_ASSERT(int_ret >= 0); - int_ret = bt_clock_class_set_is_absolute(writer_clock_class, int_ret); + int_ret = bt_clock_class_set_origin_is_unix_epoch(writer_clock_class, int_ret); BT_ASSERT(!int_ret); end: diff --git a/plugins/text/dmesg/dmesg.c b/plugins/text/dmesg/dmesg.c index 29cef2f5..914ae063 100644 --- a/plugins/text/dmesg/dmesg.c +++ b/plugins/text/dmesg/dmesg.c @@ -148,10 +148,10 @@ int create_meta(struct dmesg_component *dmesg_comp, bool has_ts) } /* - * The `dmesg` timestamp is not absolute, it's relative - * to the boot time. + * The `dmesg` timestamp's origin is not the Unix epoch, + * it's the boot time. */ - bt_clock_class_set_is_absolute(dmesg_comp->clock_class, + bt_clock_class_set_origin_is_unix_epoch(dmesg_comp->clock_class, BT_FALSE); ret = bt_stream_class_set_default_clock_class( diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c index 607023b2..a6a71b7a 100644 --- a/plugins/utils/muxer/muxer.c +++ b/plugins/utils/muxer/muxer.c @@ -736,7 +736,7 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp, * the iterator without a true * `assume-absolute-clock-classes` parameter. */ - if (bt_clock_class_is_absolute(clock_class)) { + if (bt_clock_class_origin_is_unix_epoch(clock_class)) { /* Expect absolute clock classes */ muxer_msg_iter->clock_class_expectation = MUXER_MSG_ITER_CLOCK_CLASS_EXPECTATION_ABSOLUTE; @@ -764,7 +764,7 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp, if (!muxer_comp->assume_absolute_clock_classes) { switch (muxer_msg_iter->clock_class_expectation) { case MUXER_MSG_ITER_CLOCK_CLASS_EXPECTATION_ABSOLUTE: - if (!bt_clock_class_is_absolute(clock_class)) { + if (!bt_clock_class_origin_is_unix_epoch(clock_class)) { BT_LOGE("Expecting an absolute clock class, " "but got a non-absolute one: " "clock-class-addr=%p, clock-class-name=\"%s\"", @@ -773,7 +773,7 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp, } break; case MUXER_MSG_ITER_CLOCK_CLASS_EXPECTATION_NOT_ABS_NO_UUID: - if (bt_clock_class_is_absolute(clock_class)) { + if (bt_clock_class_origin_is_unix_epoch(clock_class)) { BT_LOGE("Expecting a non-absolute clock class with no UUID, " "but got an absolute one: " "clock-class-addr=%p, clock-class-name=\"%s\"", @@ -807,7 +807,7 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp, } break; case MUXER_MSG_ITER_CLOCK_CLASS_EXPECTATION_NOT_ABS_SPEC_UUID: - if (bt_clock_class_is_absolute(clock_class)) { + if (bt_clock_class_origin_is_unix_epoch(clock_class)) { BT_LOGE("Expecting a non-absolute clock class with a specific UUID, " "but got an absolute one: " "clock-class-addr=%p, clock-class-name=\"%s\"", -- 2.34.1