From aca41b43a34a066d8ac8f76bbbd98e233f54cfa4 Mon Sep 17 00:00:00 2001
From: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Date: Tue, 27 Apr 2021 06:18:56 +0900
Subject: [PATCH] thread: Factor out convert period from usec to ticks into a
 helper function

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I1dc0a202aab61a42511d3afac6b6533cfe6d1ade
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7666
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
---
 lib/thread/thread.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/lib/thread/thread.c b/lib/thread/thread.c
index 41e8541a0..f6d1c6a35 100644
--- a/lib/thread/thread.c
+++ b/lib/thread/thread.c
@@ -1244,6 +1244,22 @@ spdk_poller_register_interrupt(struct spdk_poller *poller,
 	}
 }
 
+static uint64_t
+convert_us_to_ticks(uint64_t us)
+{
+	uint64_t quotient, remainder, ticks;
+
+	if (us) {
+		quotient = us / SPDK_SEC_TO_USEC;
+		remainder = us % SPDK_SEC_TO_USEC;
+		ticks = spdk_get_ticks_hz();
+
+		return ticks * quotient + (ticks * remainder) / SPDK_SEC_TO_USEC;
+	} else {
+		return 0;
+	}
+}
+
 static struct spdk_poller *
 poller_register(spdk_poller_fn fn,
 		void *arg,
@@ -1252,7 +1268,6 @@ poller_register(spdk_poller_fn fn,
 {
 	struct spdk_thread *thread;
 	struct spdk_poller *poller;
-	uint64_t quotient, remainder, ticks;
 
 	thread = spdk_get_thread();
 	if (!thread) {
@@ -1283,15 +1298,7 @@ poller_register(spdk_poller_fn fn,
 	poller->thread = thread;
 	poller->interruptfd = -1;
 
-	if (period_microseconds) {
-		quotient = period_microseconds / SPDK_SEC_TO_USEC;
-		remainder = period_microseconds % SPDK_SEC_TO_USEC;
-		ticks = spdk_get_ticks_hz();
-
-		poller->period_ticks = ticks * quotient + (ticks * remainder) / SPDK_SEC_TO_USEC;
-	} else {
-		poller->period_ticks = 0;
-	}
+	poller->period_ticks = convert_us_to_ticks(period_microseconds);
 
 	if (spdk_interrupt_mode_is_enabled()) {
 		int rc;