[PATCH 1/2] refscale: simplify the errexit checkpoint

From: Li Zhijian
Date: Fri Oct 22 2021 - 06:52:33 EST


Signed-off-by: Li Zhijian <lizhijian@xxxxxxxxxxxxxx>
---
kernel/rcu/refscale.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/kernel/rcu/refscale.c b/kernel/rcu/refscale.c
index 66dc14cf5687..2cbe2a2ba387 100644
--- a/kernel/rcu/refscale.c
+++ b/kernel/rcu/refscale.c
@@ -698,26 +698,25 @@ static int main_func(void *arg)
// Print the average of all experiments
SCALEOUT("END OF TEST. Calculating average duration per loop (nanoseconds)...\n");

- if (!errexit) {
- buf[0] = 0;
- strcat(buf, "\n");
- strcat(buf, "Runs\tTime(ns)\n");
- }
+ if (errexit)
+ goto err;
+
+ buf[0] = 0;
+ strcat(buf, "\n");
+ strcat(buf, "Runs\tTime(ns)\n");

for (exp = 0; exp < nruns; exp++) {
u64 avg;
u32 rem;

- if (errexit)
- break;
avg = div_u64_rem(result_avg[exp], 1000, &rem);
sprintf(buf1, "%d\t%llu.%03u\n", exp + 1, avg, rem);
strcat(buf, buf1);
}

- if (!errexit)
- SCALEOUT("%s", buf);
+ SCALEOUT("%s", buf);

+err:
// This will shutdown everything including us.
if (shutdown) {
shutdown_start = 1;
--
2.33.0