Move parse_time_string() to rt-utils.c so we can re use it. Signed-off-by: Daniel Wagner <wagi@xxxxxxxxx> --- src/cyclictest/cyclictest.c | 33 --------------------------------- src/include/rt-utils.h | 2 ++ src/lib/rt-utils.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c index ed59edefbf97..03d56e4f520c 100644 --- a/src/cyclictest/cyclictest.c +++ b/src/cyclictest/cyclictest.c @@ -406,39 +406,6 @@ static void enable_trace_mark(void) open_tracemark_fd(); } -/* - * parse an input value as a base10 value followed by an optional - * suffix. The input value is presumed to be in seconds, unless - * followed by a modifier suffix: m=minutes, h=hours, d=days - * - * the return value is a value in seconds - */ -static int parse_time_string(char *val) -{ - char *end; - int t = strtol(val, &end, 10); - if (end) { - switch (*end) { - case 'm': - case 'M': - t *= 60; - break; - - case 'h': - case 'H': - t *= 60*60; - break; - - case 'd': - case 'D': - t *= 24*60*60; - break; - - } - } - return t; -} - /* * Raise the soft priority limit up to prio, if that is less than or equal * to the hard limit diff --git a/src/include/rt-utils.h b/src/include/rt-utils.h index ef0f6acf4ab5..405fa7855346 100644 --- a/src/include/rt-utils.h +++ b/src/include/rt-utils.h @@ -24,4 +24,6 @@ uint32_t string_to_policy(const char *str); pid_t gettid(void); +int parse_time_string(char *val); + #endif /* __RT_UTILS.H */ diff --git a/src/lib/rt-utils.c b/src/lib/rt-utils.c index ac6878ccacf1..e1b166afcd6c 100644 --- a/src/lib/rt-utils.c +++ b/src/lib/rt-utils.c @@ -13,6 +13,7 @@ #include <sched.h> #include <stdarg.h> #include <errno.h> +#include <ctype.h> #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> @@ -320,3 +321,36 @@ pid_t gettid(void) { return syscall(SYS_gettid); } + +/* + * parse an input value as a base10 value followed by an optional + * suffix. The input value is presumed to be in seconds, unless + * followed by a modifier suffix: m=minutes, h=hours, d=days + * + * the return value is a value in seconds + */ +int parse_time_string(char *val) +{ + char *end; + int t = strtol(val, &end, 10); + if (end) { + switch (*end) { + case 'm': + case 'M': + t *= 60; + break; + + case 'h': + case 'H': + t *= 60*60; + break; + + case 'd': + case 'D': + t *= 24*60*60; + break; + + } + } + return t; +} -- 2.20.1