From patchwork Thu Dec 17 16:31:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 58604 Delivered-To: patch@linaro.org Received: by 10.112.89.199 with SMTP id bq7csp473866lbb; Thu, 17 Dec 2015 08:32:21 -0800 (PST) X-Received: by 10.55.72.143 with SMTP id v137mr68944819qka.73.1450369941887; Thu, 17 Dec 2015 08:32:21 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id m87si11995363qkl.12.2015.12.17.08.32.21; Thu, 17 Dec 2015 08:32:21 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 6B1DB6161C; Thu, 17 Dec 2015 16:32:21 +0000 (UTC) Authentication-Results: lists.linaro.org; dkim=fail reason="verification failed; unprotected key" header.d=linaro.org header.i=@linaro.org header.b=YjqELYoz; dkim-adsp=none (unprotected policy); dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 196FD61659; Thu, 17 Dec 2015 16:31:46 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id ECBBD61630; Thu, 17 Dec 2015 16:31:41 +0000 (UTC) Received: from mail-lf0-f47.google.com (mail-lf0-f47.google.com [209.85.215.47]) by lists.linaro.org (Postfix) with ESMTPS id A10C96161C for ; Thu, 17 Dec 2015 16:31:39 +0000 (UTC) Received: by mail-lf0-f47.google.com with SMTP id z124so50622197lfa.3 for ; Thu, 17 Dec 2015 08:31:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GL2yz2uQQuS/T3mM7MF0h/46EnxQqgWwMshdaQzmO+Q=; b=YjqELYozNlXlZs3aXuoxClDjkJz0xDYkhhVWexVV5xEnnRzuAEB9mRWRwkyACHTRQ8 xQptMtTk2vb8m8M59haWAgxN+mPxP+wZdr5xnMkpmiJ/LSwRScmxKLSyQsIffEwNEMxH aZsKZ60hsutBPmHGNTDVF58DcnSPcf2UUzhVc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GL2yz2uQQuS/T3mM7MF0h/46EnxQqgWwMshdaQzmO+Q=; b=fVn20L8ZgriIG9ld/avTYZhduJfOA1WgicHinT7G1NgZfRWKCDjk9sf+FVvKKGdBeL APbflfpsBzi1hEJdTyZ1HFobl0/EFNpbexv5SxEAb4UhtwtMaOY1l1swSiz1d0vspmIz LiDW/R+cOWNSg2tlS8YKhUoK2qug4dHWrT9KrtHgyxZQnxVvJHATBdWfdQ54fuECVtB+ cku7UynZ8rgl6R1CauRpc3cFxGM+rSsjDgKtL1GO9YDNnAiKnWDIhKc4ehmXQKAjYD7D YZgBvJUuRXgb86K3/LLlAbvDLj1no7Jm18tsd287JSMqa6UZ/hYjw6S3P80ShyytvbrD ZYOA== X-Gm-Message-State: ALoCoQljWhMyzozyOuCkS0WBGN8UG8XlA3p1INumioW9i/8QwPDHGvst4LhvwhdbKU6MWFZB3mtWCd6c05n9cbklzkTjP3LVPg== X-Received: by 10.25.205.135 with SMTP id d129mr23224417lfg.32.1450369898518; Thu, 17 Dec 2015 08:31:38 -0800 (PST) Received: from localhost.localdomain ([195.238.92.128]) by smtp.gmail.com with ESMTPSA id u12sm2030563lbk.45.2015.12.17.08.31.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Dec 2015 08:31:37 -0800 (PST) From: Ivan Khoronzhuk To: lng-odp@lists.linaro.org Date: Thu, 17 Dec 2015 18:31:24 +0200 Message-Id: <1450369889-4310-2-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450369889-4310-1-git-send-email-ivan.khoronzhuk@linaro.org> References: <1450369889-4310-1-git-send-email-ivan.khoronzhuk@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCH v4 1/6] api: time: add resolution and wait API calls X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" This patch adds odp_time_local_res() and odp_time_wait_until(), odp_time_wait_ns() APIs. Signed-off-by: Ivan Khoronzhuk --- include/odp/api/time.h | 21 ++++++++ platform/linux-generic/odp_time.c | 100 ++++++++++++++++++++++++++++++-------- 2 files changed, 101 insertions(+), 20 deletions(-) diff --git a/include/odp/api/time.h b/include/odp/api/time.h index 9865d81..3319c27 100644 --- a/include/odp/api/time.h +++ b/include/odp/api/time.h @@ -101,6 +101,27 @@ odp_time_t odp_time_local_from_ns(uint64_t ns); int odp_time_cmp(odp_time_t t2, odp_time_t t1); /** + * Local time resolution in hertz + * + * @return Local time resolution in hertz + */ +uint64_t odp_time_local_res(void); + +/** + * Wait until the specified (wall clock) time has been reached + * + * @param time Time to reach before continue + */ +void odp_time_wait_until(odp_time_t time); + +/** + * Wait the specified number of nanoseconds + * + * @param ns Time in nanoseconds to wait + */ +void odp_time_wait_ns(uint64_t ns); + +/** * Get printable value for an odp_time_t * * @param time time to be printed diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index 9b64b37..d86f5ed 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -45,7 +45,8 @@ odp_time_t time_diff(odp_time_t t2, odp_time_t t1) return time; } -odp_time_t odp_time_local(void) +static inline +odp_time_t time_local(void) { int ret; _odp_time_t time; @@ -57,17 +58,36 @@ odp_time_t odp_time_local(void) return time_diff(time.ex, start_time); } -odp_time_t odp_time_diff(odp_time_t t2, odp_time_t t1) +static inline +int time_cmp(odp_time_t t2, odp_time_t t1) { - return time_diff(t2, t1); + if (t2.tv_sec < t1.tv_sec) + return -1; + + if (t2.tv_sec > t1.tv_sec) + return 1; + + return t2.tv_nsec - t1.tv_nsec; } -uint64_t odp_time_to_ns(odp_time_t time) +static inline +odp_time_t time_sum(odp_time_t t1, odp_time_t t2) { - return time_to_ns(time); + odp_time_t time; + + time.tv_sec = t2.tv_sec + t1.tv_sec; + time.tv_nsec = t2.tv_nsec + t1.tv_nsec; + + if (time.tv_nsec >= (long)ODP_TIME_SEC_IN_NS) { + time.tv_nsec -= ODP_TIME_SEC_IN_NS; + ++time.tv_sec; + } + + return time; } -odp_time_t odp_time_local_from_ns(uint64_t ns) +static inline +odp_time_t time_local_from_ns(uint64_t ns) { odp_time_t time; @@ -77,30 +97,70 @@ odp_time_t odp_time_local_from_ns(uint64_t ns) return time; } -int odp_time_cmp(odp_time_t t2, odp_time_t t1) +static inline +void time_wait_until(odp_time_t time) { - if (t2.tv_sec < t1.tv_sec) - return -1; + odp_time_t cur; - if (t2.tv_sec > t1.tv_sec) - return 1; + do { + cur = time_local(); + } while (time_cmp(time, cur) > 0); +} - return t2.tv_nsec - t1.tv_nsec; +odp_time_t odp_time_local(void) +{ + return time_local(); +} + +odp_time_t odp_time_diff(odp_time_t t2, odp_time_t t1) +{ + return time_diff(t2, t1); +} + +uint64_t odp_time_to_ns(odp_time_t time) +{ + return time_to_ns(time); +} + +odp_time_t odp_time_local_from_ns(uint64_t ns) +{ + return time_local_from_ns(ns); +} + +int odp_time_cmp(odp_time_t t2, odp_time_t t1) +{ + return time_cmp(t2, t1); } odp_time_t odp_time_sum(odp_time_t t1, odp_time_t t2) { - odp_time_t time; + return time_sum(t1, t2); +} - time.tv_sec = t2.tv_sec + t1.tv_sec; - time.tv_nsec = t2.tv_nsec + t1.tv_nsec; +uint64_t odp_time_local_res(void) +{ + int ret; + struct timespec tres; - if (time.tv_nsec >= (long)ODP_TIME_SEC_IN_NS) { - time.tv_nsec -= ODP_TIME_SEC_IN_NS; - ++time.tv_sec; - } + ret = clock_getres(CLOCK_MONOTONIC_RAW, &tres); + if (odp_unlikely(ret != 0)) + ODP_ABORT("clock_getres failed\n"); - return time; + return ODP_TIME_SEC_IN_NS / (uint64_t)tres.tv_nsec; +} + +void odp_time_wait_ns(uint64_t ns) +{ + odp_time_t cur = time_local(); + odp_time_t wait = time_local_from_ns(ns); + odp_time_t end_time = time_sum(cur, wait); + + time_wait_until(end_time); +} + +void odp_time_wait_until(odp_time_t time) +{ + return time_wait_until(time); } uint64_t odp_time_to_u64(odp_time_t time)