X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fclock-class.c;h=119b4db929e887a3877c5b54f0489b0b6d32311f;hb=6162e6b7a6d907974d954419c2375f654f39eb72;hp=46fa733234bef6ce1ce4f9b8526f7da9cb86aa88;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git diff --git a/src/lib/trace-ir/clock-class.c b/src/lib/trace-ir/clock-class.c index 46fa7332..119b4db9 100644 --- a/src/lib/trace-ir/clock-class.c +++ b/src/lib/trace-ir/clock-class.c @@ -21,11 +21,11 @@ * SOFTWARE. */ -#define BT_LOG_TAG "CLOCK-CLASS" -#include "lib/lib-logging.h" +#define BT_LOG_TAG "LIB/CLOCK-CLASS" +#include "lib/logging.h" #include "lib/assert-pre.h" -#include "compat/uuid.h" +#include "common/uuid.h" #include #include #include "clock-class.h" @@ -37,6 +37,7 @@ #include #include "lib/object.h" #include "common/assert.h" +#include "lib/func-status.h" #define BT_ASSERT_PRE_CLOCK_CLASS_HOT(_cc) \ BT_ASSERT_PRE_HOT((_cc), "Clock class", ": %!+K", (_cc)) @@ -89,20 +90,20 @@ struct bt_clock_class *bt_clock_class_create(bt_self_component *self_comp) clock_class = g_new0(struct bt_clock_class, 1); if (!clock_class) { - BT_LOGE_STR("Failed to allocate one clock class."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one clock class."); goto error; } bt_object_init_shared(&clock_class->base, destroy_clock_class); clock_class->name.str = g_string_new(NULL); if (!clock_class->name.str) { - BT_LOGE_STR("Failed to allocate a GString."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString."); goto error; } clock_class->description.str = g_string_new(NULL); if (!clock_class->description.str) { - BT_LOGE_STR("Failed to allocate a GString."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString."); goto error; } @@ -115,7 +116,8 @@ struct bt_clock_class *bt_clock_class_create(bt_self_component *self_comp) free_clock_snapshot, clock_class); if (ret) { - BT_LOGE("Failed to initialize clock snapshot pool: ret=%d", + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to initialize clock snapshot pool: ret=%d", ret); goto error; } @@ -136,7 +138,7 @@ const char *bt_clock_class_get_name(const struct bt_clock_class *clock_class) return clock_class->name.value; } -enum bt_clock_class_status bt_clock_class_set_name( +enum bt_clock_class_set_name_status bt_clock_class_set_name( struct bt_clock_class *clock_class, const char *name) { BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class"); @@ -144,8 +146,8 @@ enum bt_clock_class_status bt_clock_class_set_name( BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class); g_string_assign(clock_class->name.str, name); clock_class->name.value = clock_class->name.str->str; - BT_LIB_LOGV("Set clock class's name: %!+K", clock_class); - return BT_CLOCK_CLASS_STATUS_OK; + BT_LIB_LOGD("Set clock class's name: %!+K", clock_class); + return BT_FUNC_STATUS_OK; } const char *bt_clock_class_get_description( @@ -155,7 +157,7 @@ const char *bt_clock_class_get_description( return clock_class->description.value; } -enum bt_clock_class_status bt_clock_class_set_description( +enum bt_clock_class_set_description_status bt_clock_class_set_description( struct bt_clock_class *clock_class, const char *descr) { BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class"); @@ -163,9 +165,9 @@ enum bt_clock_class_status bt_clock_class_set_description( BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class); g_string_assign(clock_class->description.str, descr); clock_class->description.value = clock_class->description.str->str; - BT_LIB_LOGV("Set clock class's description: %!+K", + BT_LIB_LOGD("Set clock class's description: %!+K", clock_class); - return BT_CLOCK_CLASS_STATUS_OK; + return BT_FUNC_STATUS_OK; } uint64_t bt_clock_class_get_frequency(const struct bt_clock_class *clock_class) @@ -187,7 +189,7 @@ void bt_clock_class_set_frequency(struct bt_clock_class *clock_class, "%![cc-]+K, new-freq=%" PRIu64, clock_class, frequency); clock_class->frequency = frequency; set_base_offset(clock_class); - BT_LIB_LOGV("Set clock class's frequency: %!+K", clock_class); + BT_LIB_LOGD("Set clock class's frequency: %!+K", clock_class); } uint64_t bt_clock_class_get_precision(const struct bt_clock_class *clock_class) @@ -205,7 +207,7 @@ void bt_clock_class_set_precision(struct bt_clock_class *clock_class, "Invalid precision: %![cc-]+K, new-precision=%" PRIu64, clock_class, precision); clock_class->precision = precision; - BT_LIB_LOGV("Set clock class's precision: %!+K", clock_class); + BT_LIB_LOGD("Set clock class's precision: %!+K", clock_class); } void bt_clock_class_get_offset(const struct bt_clock_class *clock_class, @@ -229,7 +231,7 @@ void bt_clock_class_set_offset(struct bt_clock_class *clock_class, clock_class->offset_seconds = seconds; clock_class->offset_cycles = cycles; set_base_offset(clock_class); - BT_LIB_LOGV("Set clock class's offset: %!+K", clock_class); + BT_LIB_LOGD("Set clock class's offset: %!+K", clock_class); } bt_bool bt_clock_class_origin_is_unix_epoch(const struct bt_clock_class *clock_class) @@ -244,7 +246,7 @@ void bt_clock_class_set_origin_is_unix_epoch(struct bt_clock_class *clock_class, BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class"); BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class); clock_class->origin_is_unix_epoch = (bool) origin_is_unix_epoch; - BT_LIB_LOGV("Set clock class's origin is Unix epoch property: %!+K", + BT_LIB_LOGD("Set clock class's origin is Unix epoch property: %!+K", clock_class); } @@ -260,9 +262,9 @@ void bt_clock_class_set_uuid(struct bt_clock_class *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); + bt_uuid_copy(clock_class->uuid.uuid, uuid); clock_class->uuid.value = clock_class->uuid.uuid; - BT_LIB_LOGV("Set clock class's UUID: %!+K", clock_class); + BT_LIB_LOGD("Set clock class's UUID: %!+K", clock_class); } BT_HIDDEN @@ -278,7 +280,8 @@ void _bt_clock_class_freeze(const struct bt_clock_class *clock_class) ((struct bt_clock_class *) clock_class)->frozen = 1; } -enum bt_clock_class_status bt_clock_class_cycles_to_ns_from_origin( +enum bt_clock_class_cycles_to_ns_from_origin_status +bt_clock_class_cycles_to_ns_from_origin( const struct bt_clock_class *clock_class, uint64_t cycles, int64_t *ns) { @@ -288,8 +291,8 @@ enum bt_clock_class_status bt_clock_class_cycles_to_ns_from_origin( BT_ASSERT_PRE_NON_NULL(ns, "Nanoseconds (output)"); ret = bt_util_ns_from_origin_clock_class(clock_class, cycles, ns); if (ret) { - ret = BT_CLOCK_CLASS_STATUS_OVERFLOW; - BT_LIB_LOGW("Cannot convert cycles to nanoseconds " + ret = BT_FUNC_STATUS_OVERFLOW; + BT_LIB_LOGD("Cannot convert cycles to nanoseconds " "from origin for given clock class: " "value overflows the signed 64-bit integer range: " "%![cc-]+K, cycles=%" PRIu64,