From patchwork Wed Aug 5 21:01:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 51976 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by patches.linaro.org (Postfix) with ESMTPS id 2C6DF22A15 for ; Wed, 5 Aug 2015 21:04:29 +0000 (UTC) Received: by lbbyj8 with SMTP id yj8sf16905485lbb.3 for ; Wed, 05 Aug 2015 14:04:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:content-type:content-transfer-encoding:errors-to :sender:x-original-sender:x-original-authentication-results :mailing-list; bh=qdF/IOFoMzd2CE6bqPI4eATAQfDiXj9lDE6QH/bngXI=; b=hcpqIyWh+Dcd7nNFvDb8GLy6I/8zW+n3IMceDGOlnlnkpF/N9czo7z5iAR6L7DHltS 8kGonDtQKKfviKAoeDtibId7enPUG+b71mzFcGG1iEWJyxFpkVnTJXJ+NYvQ86d2cOpb x9n69IZ9F+4S7jWlGqKTRhxXIxKe37EG67EPSktD7r1mxmAKHY1iA93CnyNxO4zlKeCT mgbY+FeUNbuOQ61yqe0N+/4ypHAWevMRVeAg8djjx9D37GZjsqDnrTRW4SXwDyFg8Pqv 1/ZZO/gKkuBfyQrm7MIGCodDdALkTwvoJyTeDKHu5KuggQZyCZd1hVW1jqkwJTkA4FE5 pOHA== X-Gm-Message-State: ALoCoQn/B9oTo7v5Q3VbrnHLPQFLxp/8K1U4ZNYgMKRgV6KbyyrgePJi3roFLAP2dOJAwSLtIEpf X-Received: by 10.180.96.137 with SMTP id ds9mr343292wib.2.1438808668150; Wed, 05 Aug 2015 14:04:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.9.70 with SMTP id x6ls244788laa.5.gmail; Wed, 05 Aug 2015 14:04:27 -0700 (PDT) X-Received: by 10.152.30.100 with SMTP id r4mr11216411lah.92.1438808667857; Wed, 05 Aug 2015 14:04:27 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id l7si3032681lbo.54.2015.08.05.14.04.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Aug 2015 14:04:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by lbbyj8 with SMTP id yj8so31653397lbb.0 for ; Wed, 05 Aug 2015 14:04:27 -0700 (PDT) X-Received: by 10.152.4.163 with SMTP id l3mr11473039lal.35.1438808667182; Wed, 05 Aug 2015 14:04:27 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp575801lba; Wed, 5 Aug 2015 14:04:26 -0700 (PDT) X-Received: by 10.140.96.80 with SMTP id j74mr20390904qge.43.1438808665821; Wed, 05 Aug 2015 14:04:25 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 143si7675961qhc.39.2015.08.05.14.04.25; Wed, 05 Aug 2015 14:04:25 -0700 (PDT) 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; Received: by lists.linaro.org (Postfix, from userid 109) id 212B962073; Wed, 5 Aug 2015 21:04:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252.ec2.internal X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from ip-10-142-244-252.ec2.internal (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id EBBA762070; Wed, 5 Aug 2015 21:01: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 3776F6206F; Wed, 5 Aug 2015 21:01:31 +0000 (UTC) Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by lists.linaro.org (Postfix) with ESMTPS id 96A9D62067 for ; Wed, 5 Aug 2015 21:01:25 +0000 (UTC) Received: by wibhh20 with SMTP id hh20so41353503wib.0 for ; Wed, 05 Aug 2015 14:01:24 -0700 (PDT) X-Received: by 10.194.21.230 with SMTP id y6mr26135715wje.132.1438808484609; Wed, 05 Aug 2015 14:01:24 -0700 (PDT) Received: from khorivan.synapse.com (46-148-93-178.pool.ukrtel.net. [178.93.148.46]) by smtp.gmail.com with ESMTPSA id rz9sm5931423wjb.8.2015.08.05.14.01.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Aug 2015 14:01:24 -0700 (PDT) From: Ivan Khoronzhuk To: lng-odp@lists.linaro.org Date: Thu, 6 Aug 2015 00:01:12 +0300 Message-Id: <1438808473-26968-4-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1438808473-26968-1-git-send-email-ivan.khoronzhuk@linaro.org> References: <1438808473-26968-1-git-send-email-ivan.khoronzhuk@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCH 3/4] linux-generic: use appropriate time API with count instead of cycles X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: 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" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ivan.khoronzhuk@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 The time API were changed from *_cycles* to *_counts*, so use appropriate names. Signed-off-by: Ivan Khoronzhuk --- platform/linux-generic/arch/linux/odp_time.c | 2 +- platform/linux-generic/arch/mips64/odp_time.c | 2 +- platform/linux-generic/arch/x86/odp_time.c | 2 +- platform/linux-generic/odp_schedule.c | 8 ++++---- platform/linux-generic/odp_time.c | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/platform/linux-generic/arch/linux/odp_time.c b/platform/linux-generic/arch/linux/odp_time.c index 4dc0764..f13b0ff 100644 --- a/platform/linux-generic/arch/linux/odp_time.c +++ b/platform/linux-generic/arch/linux/odp_time.c @@ -16,7 +16,7 @@ #define GIGA 1000000000 -uint64_t odp_time_cycles(void) +uint64_t odp_time_counts(void) { struct timespec time; uint64_t sec, ns, hz, cycles; diff --git a/platform/linux-generic/arch/mips64/odp_time.c b/platform/linux-generic/arch/mips64/odp_time.c index 4fb790b..afc61b0 100644 --- a/platform/linux-generic/arch/mips64/odp_time.c +++ b/platform/linux-generic/arch/mips64/odp_time.c @@ -8,7 +8,7 @@ #include #include -uint64_t odp_time_cycles(void) +uint64_t odp_time_counts(void) { #define CVMX_TMP_STR(x) CVMX_TMP_STR2(x) #define CVMX_TMP_STR2(x) #x diff --git a/platform/linux-generic/arch/x86/odp_time.c b/platform/linux-generic/arch/x86/odp_time.c index a111561..819b273 100644 --- a/platform/linux-generic/arch/x86/odp_time.c +++ b/platform/linux-generic/arch/x86/odp_time.c @@ -5,7 +5,7 @@ */ #include -uint64_t odp_time_cycles(void) +uint64_t odp_time_counts(void) { union { uint64_t tsc_64; diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index 5d32c81..fb60fc1 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -528,12 +528,12 @@ static int schedule_loop(odp_queue_t *out_queue, uint64_t wait, break; if (start_cycle == 0) { - start_cycle = odp_time_cycles(); + start_cycle = odp_time_counts(); continue; } - cycle = odp_time_cycles(); - diff = odp_time_diff_cycles(start_cycle, cycle); + cycle = odp_time_counts(); + diff = odp_time_diff_counts(start_cycle, cycle); if (wait < diff) break; @@ -579,7 +579,7 @@ uint64_t odp_schedule_wait_time(uint64_t ns) if (ns <= ODP_SCHED_NO_WAIT) ns = ODP_SCHED_NO_WAIT + 1; - return odp_time_ns_to_cycles(ns); + return odp_time_ns_to_counts(ns); } diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index a08833d..c0678d6 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -12,7 +12,7 @@ #define GIGA 1000000000 -uint64_t odp_time_diff_cycles(uint64_t t1, uint64_t t2) +uint64_t odp_time_diff_counts(uint64_t t1, uint64_t t2) { if (odp_likely(t2 > t1)) return t2 - t1; @@ -20,7 +20,7 @@ uint64_t odp_time_diff_cycles(uint64_t t1, uint64_t t2) return t2 + (UINT64_MAX - t1); } -uint64_t odp_time_cycles_to_ns(uint64_t cycles) +uint64_t odp_time_counts_to_ns(uint64_t cycles) { uint64_t hz = odp_sys_cpu_hz(); @@ -31,7 +31,7 @@ uint64_t odp_time_cycles_to_ns(uint64_t cycles) } -uint64_t odp_time_ns_to_cycles(uint64_t ns) +uint64_t odp_time_ns_to_counts(uint64_t ns) { uint64_t hz = odp_sys_cpu_hz();