From c4c4586d8e13b634fb0b103c57dcddd6fa13c69b Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 14 Aug 2019 15:02:50 -0400 Subject: [PATCH] lib: standardize status of bt_util_clock_cycles_to_ns_from_origin() Signed-off-by: Philippe Proulx Change-Id: Ibfe6f7e345f838503b94140e30ec7a7b35866595 Reviewed-on: https://review.lttng.org/c/babeltrace/+/1931 Tested-by: jenkins Reviewed-by: Francis Deslauriers --- include/babeltrace2/util.h | 11 ++++++----- src/lib/util.c | 10 ++++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/include/babeltrace2/util.h b/include/babeltrace2/util.h index 8d9585c3..d4826541 100644 --- a/include/babeltrace2/util.h +++ b/include/babeltrace2/util.h @@ -33,12 +33,13 @@ extern "C" { #endif -typedef enum bt_util_status { - BT_UTIL_STATUS_OK = 0, - BT_UTIL_STATUS_OVERFLOW_ERROR = -75, -} bt_util_status; +typedef enum bt_util_clock_cycles_to_ns_from_origin_status { + BT_UTIL_CLOCK_CYCLES_TO_NS_FROM_ORIGIN_STATUS_OK = __BT_FUNC_STATUS_OK, + BT_UTIL_CLOCK_CYCLES_TO_NS_FROM_ORIGIN_STATUS_OVERFLOW_ERROR = __BT_FUNC_STATUS_OVERFLOW_ERROR, +} bt_util_clock_cycles_to_ns_from_origin_status; -bt_util_status bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles, +bt_util_clock_cycles_to_ns_from_origin_status +bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles, uint64_t frequency, int64_t offset_seconds, uint64_t offset_cycles, int64_t *ns); diff --git a/src/lib/util.c b/src/lib/util.c index d6b90537..3ba4c476 100644 --- a/src/lib/util.c +++ b/src/lib/util.c @@ -31,13 +31,15 @@ #include #include "lib/trace-ir/utils.h" -bt_util_status bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles, +bt_util_clock_cycles_to_ns_from_origin_status +bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles, uint64_t frequency, int64_t offset_seconds, uint64_t offset_cycles, int64_t *ns) { bool overflows; int64_t base_offset_ns; - bt_util_status status = BT_UTIL_STATUS_OK; + bt_util_clock_cycles_to_ns_from_origin_status status = + BT_FUNC_STATUS_OK; int ret; BT_ASSERT_PRE_NON_NULL(ns, "Nanoseconds (output)"); @@ -51,7 +53,7 @@ bt_util_status bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles, overflows = bt_util_get_base_offset_ns(offset_seconds, offset_cycles, frequency, &base_offset_ns); if (overflows) { - status = BT_UTIL_STATUS_OVERFLOW_ERROR; + status = BT_FUNC_STATUS_OVERFLOW_ERROR; goto end; } @@ -59,7 +61,7 @@ bt_util_status bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles, offset_seconds, offset_cycles, frequency, cycles, ns); if (ret) { - status = BT_UTIL_STATUS_OVERFLOW_ERROR; + status = BT_FUNC_STATUS_OVERFLOW_ERROR; } end: -- 2.34.1