From patchwork Fri Aug 7 22:28:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 52052 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id 0425220539 for ; Fri, 7 Aug 2015 22:30:41 +0000 (UTC) Received: by wijp15 with SMTP id p15sf21499437wij.3 for ; Fri, 07 Aug 2015 15:30:40 -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=/qB0jrBVXR0UXCRxq3lYGxsrx6s2r+Aad6W9DLBTQso=; b=R9AhOPU6KcPBkDd1p3urpD6Kpc6qApkHwoiCxH8PFLkJvEfLlcj8c7C2VAwQfXlKmi w9/206RrRHNJYup7m5IScqWiKweMX9VPxh57Xm0BruXaMVfnWsFivQDSxvraX6cjthuu 1JmmzFXC1qoofYHOh2UAXuQy9NDV8ZMkrJIs4MAcejV+eAo3yUzh2kyx04N0VJvXpGxS u4ABKK3F63oY7sxCpgf5t3INP2Rcha00qJJyhyWtjYr1yaKPM/qw5vuO0FgldSBkArcA qrJnn1B0uDkqTYlfnzFN8mK/uoO15Fs/fKZ/GI/IZyOrnkMYFXa0Anrs+nD+Ftn1F9uY wDhA== X-Gm-Message-State: ALoCoQnNRHQyKZQ4dAff4bi1hfjvNsDEIZxZT6O98vXAoHIgQiJhB8vPvQNqFvX5U26ex0vP1BT/ X-Received: by 10.112.142.97 with SMTP id rv1mr2773552lbb.12.1438986639936; Fri, 07 Aug 2015 15:30:39 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.204.9 with SMTP id ku9ls478054lac.37.gmail; Fri, 07 Aug 2015 15:30:39 -0700 (PDT) X-Received: by 10.152.37.67 with SMTP id w3mr10244769laj.123.1438986639660; Fri, 07 Aug 2015 15:30:39 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id ls9si8699266lac.7.2015.08.07.15.30.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Aug 2015 15:30:39 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by labd1 with SMTP id d1so15786226lab.1 for ; Fri, 07 Aug 2015 15:30:39 -0700 (PDT) X-Received: by 10.112.129.137 with SMTP id nw9mr4171050lbb.19.1438986639365; Fri, 07 Aug 2015 15:30:39 -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 l6csp643182lba; Fri, 7 Aug 2015 15:30:38 -0700 (PDT) X-Received: by 10.140.23.102 with SMTP id 93mr17221619qgo.61.1438986637546; Fri, 07 Aug 2015 15:30:37 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id z12si20616966qhd.79.2015.08.07.15.30.36; Fri, 07 Aug 2015 15:30:37 -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 ABBC662341; Fri, 7 Aug 2015 22:30:36 +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 5794A62348; Fri, 7 Aug 2015 22:29:06 +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 520B862341; Fri, 7 Aug 2015 22:28:46 +0000 (UTC) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com [209.85.215.44]) by lists.linaro.org (Postfix) with ESMTPS id D07B762331 for ; Fri, 7 Aug 2015 22:28:43 +0000 (UTC) Received: by labjt7 with SMTP id jt7so57416581lab.0 for ; Fri, 07 Aug 2015 15:28:42 -0700 (PDT) X-Received: by 10.112.36.165 with SMTP id r5mr10198144lbj.3.1438986522790; Fri, 07 Aug 2015 15:28:42 -0700 (PDT) Received: from khorivan.synapse.com (14-148-93-178.pool.ukrtel.net. [178.93.148.14]) by smtp.gmail.com with ESMTPSA id ad1sm422651lbc.5.2015.08.07.15.28.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Aug 2015 15:28:42 -0700 (PDT) From: Ivan Khoronzhuk To: lng-odp@lists.linaro.org Date: Sat, 8 Aug 2015 01:28:09 +0300 Message-Id: <1438986490-12100-4-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1438986490-12100-1-git-send-email-ivan.khoronzhuk@linaro.org> References: <1438986490-12100-1-git-send-email-ivan.khoronzhuk@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCH v2 3/4] linux-generic: use appropriate time API with tick 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.215.45 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 *_tick*, 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..bd16a32 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_tick(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..2a68aa5 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_tick(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..a4f60e1 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_tick(void) { union { uint64_t tsc_64; diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index 5d32c81..d0cd41e 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_tick(); continue; } - cycle = odp_time_cycles(); - diff = odp_time_diff_cycles(start_cycle, cycle); + cycle = odp_time_tick(); + diff = odp_time_ticks_diff(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_tick(ns); } diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index a08833d..aed3702 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_ticks_diff(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_tick_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_tick(uint64_t ns) { uint64_t hz = odp_sys_cpu_hz();