From patchwork Wed Jun 5 16:06:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 165904 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp7548096ili; Wed, 5 Jun 2019 09:06:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqzlb2RYlJEmr2RtMD5hVZuIwBV607MICzG10mekYObFTVH7AukEJfOQ/UVWoYVEfNgb0tQ/ X-Received: by 2002:a63:ef56:: with SMTP id c22mr5481847pgk.13.1559750797243; Wed, 05 Jun 2019 09:06:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559750797; cv=none; d=google.com; s=arc-20160816; b=s1Bx7UcWFe0ODEe0GQr1u5q7ZI/4iZv5L2BGh4B5jfSu7RSjnFkbwd8h/cTmQxFlS8 Qoz7ZMxLqQwACNhocPZrk5p4WIs4ISRzzgn/9gGFYW79aG7RN7g0gG+Sjk4ZnDtGBHMX wmCDUf+LIK/m/dJK93cR/3B1596uAsMizCgEQx3bhlHdLrgS8B6ZUT6fMm6RWGY3dtyj FrkBqf274c+CBo/0zIIo7J2ZbE38R3nfGdJHlxlI615uACggDPEjxAktlj932YvWzgsG yS8zqZK050UtAwKzpY0y8IJWXUB158CgffSwzbxQszgjXaChZ0LrwGM6xWbbKauGdkXX WgbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=3qDgzuTBM+uw6b7rn9cS2fL/vWiODGNhhGkSVKX58/8=; b=iH78dJdEfAhEAD/Rq5e/6U/0Pjgl5q7Qu07k0GxP3JfHCm6lTo4GzbYWLAQpu8Vuvi LKV1p4w8YPGX7Ul5k2t69sRh1aV9/njjUtIfeRDrjeIr/j6yCBrII/kz7KYmgDdiuOHM UO7iPnIF2myQAmC6ZD5M1JQoRcSNCsL66LdMv6JdCR7eCssVB0YoDZIzmoZem5ltovC3 vpQQKsfmmAdBz6CPzU2P5E8NUtNRTRDAuS56jaOwnEFy4GiGowFtwSxDOrK5QO0ZurYX 07/diaCjLerrAx3+QWz7gm20S0TrvSGZrSjeYsmnimcSic/vXD2d/RJii9vA9SuHu4GP f8Bg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-rt-users-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-rt-users-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=monom.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q6si27364257pgm.101.2019.06.05.09.06.36; Wed, 05 Jun 2019 09:06:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-rt-users-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-rt-users-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-rt-users-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=monom.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728593AbfFEQGg (ORCPT + 3 others); Wed, 5 Jun 2019 12:06:36 -0400 Received: from mail.monom.org ([188.138.9.77]:35608 "EHLO mail.monom.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726421AbfFEQGc (ORCPT ); Wed, 5 Jun 2019 12:06:32 -0400 Received: from mail.monom.org (localhost [127.0.0.1]) by filter.mynetwork.local (Postfix) with ESMTP id EE026500709; Wed, 5 Jun 2019 18:06:30 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.monom.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (ppp-93-104-174-142.dynamic.mnet-online.de [93.104.174.142]) by mail.monom.org (Postfix) with ESMTPSA id B20115004BB; Wed, 5 Jun 2019 18:06:30 +0200 (CEST) From: Daniel Wagner To: John Kacur Cc: linux-rt-users@vger.kernel.org, Daniel Wagner Subject: [PATCH v2 03/12] rt-utils: Move parse_time_string() Date: Wed, 5 Jun 2019 18:06:08 +0200 Message-Id: <20190605160617.22987-4-wagi@monom.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190605160617.22987-1-wagi@monom.org> References: <20190605160617.22987-1-wagi@monom.org> MIME-Version: 1.0 Sender: linux-rt-users-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org Move parse_time_string() to rt-utils.c so we can re use it. Signed-off-by: Daniel Wagner --- src/cyclictest/cyclictest.c | 33 --------------------------------- src/include/rt-utils.h | 2 ++ src/lib/rt-utils.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 33 deletions(-) -- 2.20.1 Signed-off-by: John Kacur 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 #include #include +#include #include #include #include @@ -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; +}