From bc3d96925b78b7e6e07954f8ff19ce4ba1a2f5a8 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 24 Jul 2019 14:43:49 -0400 Subject: [PATCH] lib: append error cause when returning `BT_FUNC_STATUS_OVERFLOW` `BT_FUNC_STATUS_OVERFLOW` is an error status, so append an error cause to make details available. Signed-off-by: Philippe Proulx Change-Id: I1524a088698a7b8bf240e8b1206bf06d4b21870f Reviewed-on: https://review.lttng.org/c/babeltrace/+/1769 Tested-by: jenkins --- src/lib/trace-ir/clock-class.c | 4 ++-- src/lib/trace-ir/clock-snapshot.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/trace-ir/clock-class.c b/src/lib/trace-ir/clock-class.c index 065cf976..fb0d108c 100644 --- a/src/lib/trace-ir/clock-class.c +++ b/src/lib/trace-ir/clock-class.c @@ -291,12 +291,12 @@ bt_clock_class_cycles_to_ns_from_origin( BT_ASSERT_PRE_DEV_NON_NULL(ns, "Nanoseconds (output)"); ret = bt_util_ns_from_origin_clock_class(clock_class, cycles, ns); if (ret) { - ret = BT_FUNC_STATUS_OVERFLOW; - BT_LIB_LOGD("Cannot convert cycles to nanoseconds " + BT_LIB_LOGE_APPEND_CAUSE("Cannot convert cycles to nanoseconds " "from origin for given clock class: " "value overflows the signed 64-bit integer range: " "%![cc-]+K, cycles=%" PRIu64, clock_class, cycles); + ret = BT_FUNC_STATUS_OVERFLOW; } return ret; diff --git a/src/lib/trace-ir/clock-snapshot.c b/src/lib/trace-ir/clock-snapshot.c index fef9f670..e418fff6 100644 --- a/src/lib/trace-ir/clock-snapshot.c +++ b/src/lib/trace-ir/clock-snapshot.c @@ -163,7 +163,8 @@ bt_clock_snapshot_get_ns_from_origin( "Clock snapshot is not set: %!+k", clock_snapshot); if (clock_snapshot->ns_from_origin_overflows) { - BT_LIB_LOGD("Clock snapshot, once converted to nanoseconds from origin, " + BT_LIB_LOGE_APPEND_CAUSE( + "Clock snapshot, once converted to nanoseconds from origin, " "overflows the signed 64-bit integer range: " "%![cs-]+k", clock_snapshot); ret = BT_FUNC_STATUS_OVERFLOW; -- 2.34.1