From patchwork Thu Nov 5 11:04:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 56036 Delivered-To: patch@linaro.org Received: by 10.112.61.134 with SMTP id p6csp337652lbr; Thu, 5 Nov 2015 03:08:06 -0800 (PST) X-Received: by 10.140.220.19 with SMTP id q19mr6834659qhb.48.1446721686853; Thu, 05 Nov 2015 03:08:06 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id x138si4060811qka.109.2015.11.05.03.08.06; Thu, 05 Nov 2015 03:08:06 -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.20150623.gappssmtp.com Received: by lists.linaro.org (Postfix, from userid 109) id 6C581619C1; Thu, 5 Nov 2015 11:08:06 +0000 (UTC) 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 CE89261CFF; Thu, 5 Nov 2015 11:06:30 +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 3AD3B619AF; Thu, 5 Nov 2015 11:06:03 +0000 (UTC) Received: from mail-lf0-f42.google.com (mail-lf0-f42.google.com [209.85.215.42]) by lists.linaro.org (Postfix) with ESMTPS id CA8BB61B63 for ; Thu, 5 Nov 2015 11:04:53 +0000 (UTC) Received: by lfgh9 with SMTP id h9so55695152lfg.1 for ; Thu, 05 Nov 2015 03:04:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3bjpaTyYRJG4NnAqLWwMHDEm4hOfpGFNqtFs3ZIfEHs=; b=GkJPkkLdusU6Xr2gLWJ1Q21TPFPBtuRQ/1DmTAUDlDI4qGwQjoLU57SM4QcFjeBPfN OSbNfyDp5TvmKEd8WJCQ+qgbkEBb6SFcqQpCVLlrHvorDHeWaXPSBwcVmE5enGpkkNlD 6IltPmeZ6J2AEzLFLbT4GgYmHUg4Zu0TC2hxjayV/qg3CGhwY8fzg9tVF68m9evtff7E tN1bZ2NM+Srq6Rcyxz3Ndx9dO3rvvsJb/1TIjD+hb/+dVwbOkm7SD2WNnjqIWlMsEyY7 ctCwUxpOW5iW3NacZAwUr5A1MqvI+Zs/mm5jHVSbB9HvYTFOMOHF7LzPHnLg8YpDnXMx 3DYA== 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=3bjpaTyYRJG4NnAqLWwMHDEm4hOfpGFNqtFs3ZIfEHs=; b=I5Gepf3eZnlQ6/aSzTBpRIA8svgE9Os3p2cvuuA6jfVJsbaF9JP8nMB1ymgG701qcy ceDk42AsaybLw3B5l6v3FWnPlgW1w7eL/hcT1h/Vu1MTUY3q0VGkQDPEO2QJWR+MOTD+ 5gIgR8+62T2OzRh429XSt1V3h+B2AXe9Zrqp9xH3Q6gCf1ED/DyAAPKGX+tv4KJRE25n sHEhgCUVdmKylOKNrKTWiiXY8UAE5CaRryhYbgrc8Uqop1njBwp0UzWuHCGl+oAbAFY1 +XSIPScVkCAdXPcutPY+UAmwfxo2juoqodtexGDtwq+V5mXuu+Obo1gHfvx4JmhBf+1k lQKw== X-Gm-Message-State: ALoCoQlQBkumNpHJvHkzN3kpDxScBZA/plWzLfCFXzCZcDNvGwT48vmfZ2/qNcKltoNh5JaHVEwj X-Received: by 10.25.206.16 with SMTP id e16mr1876305lfg.39.1446721492568; Thu, 05 Nov 2015 03:04:52 -0800 (PST) Received: from localhost.localdomain ([195.238.92.128]) by smtp.gmail.com with ESMTPSA id xk9sm868550lbb.23.2015.11.05.03.04.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Nov 2015 03:04:51 -0800 (PST) From: Ivan Khoronzhuk To: lng-odp@lists.linaro.org Date: Thu, 5 Nov 2015 13:04:36 +0200 Message-Id: <1446721478-30656-5-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446721478-30656-1-git-send-email-ivan.khoronzhuk@linaro.org> References: <1446721478-30656-1-git-send-email-ivan.khoronzhuk@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCH v6 4/6] linux-generic: align implementation with new time API 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" The time API names were changed from odp_time_cycle* to odp_time*. Also new time API operates with new opaque type - odp_time_t, as result several new API calls were added. For odp_schdule.c avoid "cycle" word usage as it was left from old time API names. This patch is intended to align linux-generic implementation with new time API. Signed-off-by: Ivan Khoronzhuk --- platform/linux-generic/Makefile.am | 1 + .../linux-generic/include/odp/plat/time_types.h | 36 +++++++++++++ platform/linux-generic/include/odp/time.h | 1 + platform/linux-generic/odp_schedule.c | 16 +++--- platform/linux-generic/odp_time.c | 62 ++++++++++++++++++---- platform/linux-generic/odp_timer.c | 4 +- 6 files changed, 99 insertions(+), 21 deletions(-) create mode 100644 platform/linux-generic/include/odp/plat/time_types.h diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 610c79c..a6b6029 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -76,6 +76,7 @@ odpplatinclude_HEADERS = \ $(srcdir)/include/odp/plat/strong_types.h \ $(srcdir)/include/odp/plat/thrmask_types.h \ $(srcdir)/include/odp/plat/ticketlock_types.h \ + $(srcdir)/include/odp/plat/time_types.h \ $(srcdir)/include/odp/plat/timer_types.h \ $(srcdir)/include/odp/plat/version_types.h diff --git a/platform/linux-generic/include/odp/plat/time_types.h b/platform/linux-generic/include/odp/plat/time_types.h new file mode 100644 index 0000000..9ba1508 --- /dev/null +++ b/platform/linux-generic/include/odp/plat/time_types.h @@ -0,0 +1,36 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP time service + */ + +#ifndef ODP_TIME_TYPES_H_ +#define ODP_TIME_TYPES_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @addtogroup odp_time + * @{ + **/ + +typedef uint64_t odp_time_t; + +#define ODP_TIME_NULL ((odp_time_t)0) + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp/time.h b/platform/linux-generic/include/odp/time.h index 3a3960b..44e0d0d 100644 --- a/platform/linux-generic/include/odp/time.h +++ b/platform/linux-generic/include/odp/time.h @@ -21,6 +21,7 @@ extern "C" { +#include #include #ifdef __cplusplus diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index 6df8073..98f7e9a 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -585,10 +585,10 @@ static int schedule_loop(odp_queue_t *out_queue, uint64_t wait, odp_event_t out_ev[], unsigned int max_num, unsigned int max_deq) { - uint64_t start_cycle, cycle, diff; + odp_time_t start_time, time, diff; int ret; - start_cycle = 0; + start_time = ODP_TIME_NULL; while (1) { ret = schedule(out_queue, out_ev, max_num, max_deq); @@ -602,15 +602,15 @@ static int schedule_loop(odp_queue_t *out_queue, uint64_t wait, if (wait == ODP_SCHED_NO_WAIT) break; - if (start_cycle == 0) { - start_cycle = odp_time_cycles(); + if (!odp_time_cmp(start_time, ODP_TIME_NULL)) { + start_time = odp_time_local(); continue; } - cycle = odp_time_cycles(); - diff = odp_time_diff_cycles(start_cycle, cycle); + time = odp_time_local(); + diff = odp_time_diff(start_time, time); - if (wait < diff) + if (odp_time_cmp(diff, wait) > 0) break; } @@ -651,7 +651,7 @@ void odp_schedule_resume(void) uint64_t odp_schedule_wait_time(uint64_t ns) { - return odp_time_ns_to_cycles(ns); + return odp_time_to_u64(odp_time_local_from_ns(ns)); } diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index abafd12..3fe0a5e 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -14,33 +14,73 @@ #define GIGA 1000000000 -uint64_t odp_time_cycles(void) +static inline +uint64_t time_to_tick(odp_time_t time) { - return odp_cpu_cycles(); + return (uint64_t)time; } -uint64_t odp_time_diff_cycles(uint64_t t1, uint64_t t2) +static inline +odp_time_t tick_to_time(uint64_t tick) { - return _odp_cpu_cycles_diff(t1, t2); + return (odp_time_t)tick; } -uint64_t odp_time_cycles_to_ns(uint64_t cycles) +odp_time_t odp_time_local(void) +{ + return tick_to_time(odp_cpu_cycles()); +} + +odp_time_t odp_time_diff(odp_time_t t1, odp_time_t t2) +{ + return tick_to_time(_odp_cpu_cycles_diff(t1, t2)); +} + +uint64_t odp_time_to_ns(odp_time_t time) { uint64_t hz = odp_cpu_hz_max(); + uint64_t tick = time_to_tick(time); - if (cycles > (UINT64_MAX / GIGA)) - return (cycles/hz)*GIGA; + if (tick > (UINT64_MAX / GIGA)) + return (tick / hz) * GIGA; - return (cycles*GIGA)/hz; + return (tick * GIGA) / hz; } -uint64_t odp_time_ns_to_cycles(uint64_t ns) +odp_time_t odp_time_local_from_ns(uint64_t ns) { uint64_t hz = odp_cpu_hz_max(); if (ns > (UINT64_MAX / hz)) - return (ns/GIGA)*hz; + return tick_to_time((ns / GIGA) * hz); + + return tick_to_time((ns * hz) / GIGA); +} + +int odp_time_cmp(odp_time_t t1, odp_time_t t2) +{ + uint64_t tick1 = time_to_tick(t1); + uint64_t tick2 = time_to_tick(t2); - return (ns*hz)/GIGA; + if (tick1 < tick2) + return 1; + + if (tick1 > tick2) + return -1; + + return 0; +} + +odp_time_t odp_time_sum(odp_time_t t1, odp_time_t t2) +{ + uint64_t tick1 = time_to_tick(t1); + uint64_t tick2 = time_to_tick(t2); + + return tick_to_time(tick1 + tick2); +} + +uint64_t odp_time_to_u64(odp_time_t hdl) +{ + return time_to_tick(hdl); } diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index e8f0267..bb32aa6 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -672,8 +672,8 @@ static void itimer_init(odp_timer_pool *tp) strerror(errno)); res = tp->param.res_ns; - sec = res / ODP_TIME_SEC; - nsec = res - sec * ODP_TIME_SEC; + sec = res / ODP_TIME_SEC_IN_NS; + nsec = res - sec * ODP_TIME_SEC_IN_NS; ispec.it_interval.tv_sec = (time_t)sec; ispec.it_interval.tv_nsec = (long)nsec;