From patchwork Thu Nov 5 11:04:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 56037 Delivered-To: patch@linaro.org Received: by 10.112.61.134 with SMTP id p6csp338128lbr; Thu, 5 Nov 2015 03:09:01 -0800 (PST) X-Received: by 10.55.197.3 with SMTP id p3mr6614608qki.11.1446721741590; Thu, 05 Nov 2015 03:09:01 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id s76si4060311qhb.82.2015.11.05.03.09.01; Thu, 05 Nov 2015 03:09:01 -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 3C3D361849; Thu, 5 Nov 2015 11:09:01 +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 42C0A61D69; Thu, 5 Nov 2015 11:06:33 +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 2C07D619AF; Thu, 5 Nov 2015 11:06:04 +0000 (UTC) Received: from mail-lf0-f44.google.com (mail-lf0-f44.google.com [209.85.215.44]) by lists.linaro.org (Postfix) with ESMTPS id 4711C61C6A for ; Thu, 5 Nov 2015 11:04:56 +0000 (UTC) Received: by lfbn126 with SMTP id n126so56043211lfb.2 for ; Thu, 05 Nov 2015 03:04:55 -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=0DOUsR0Mhpjuy31Hl6sXoHv8Zl/wDfMPteOI4XnTEYY=; b=kJ1Uivehys0kPKVLP0wstb0BwYIDtXnuYV7hcWQDwdVMWiUaLlSS6uvKA2VuiKP+Ra yIHHgEsROlLhF+wykiegUaxj7el4b1oUtFH4RV/DscVXDT+1JsBAVg0UuRTB0qKYsxzr C5/AY0+sHQQzwX4rRgqQ00/vqAwmHr8+1lw2Uqnk4NGFzZoWWBf1o2WIewm7ugKTWVX8 yn1cj4SOayjpv0uXjz9aquaxQ9iFSmjOwA8L/wreFMzf6/lyUmxXkbm03qYgN7EGsko/ 3N20pe31iHv5xaq4Wyanz2Kz4kzbgo8nvIDp/lsmHp/AoxlvwB87kBXKPeAMqh/a90P6 +7zQ== 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=0DOUsR0Mhpjuy31Hl6sXoHv8Zl/wDfMPteOI4XnTEYY=; b=KrKp1CVi0+TmukGGdXTq/2OhAsRaQhA2K7x4o9e5XSw0XRNSj7GX2PZb359kKt1FQn 5PxwypUQaAXLKB+W/lx+NoBiF7yXPhOHczmzvMRnbUe7z5WkcFA5ZoMDtREDqZiYFuwD G1r4uUyzAb+xvvAoiY5ON5VCW/TlYFYxnrnTpjzaqdf6rTa6V3A0AY67edWcQ8apDCEd CvS/D/ngOenW1BlT3XUpVsXB5J6y6eV82F1P+aP0QjK3+bVmUiegGY7cepHIF0OkusZV PtbpeI+0jv4q5SFl4xpn8sf5XQQRElHWgA/yI9Pi2KUiSG/py79U4Xfcu1Mb0baMoEuA tvPQ== X-Gm-Message-State: ALoCoQluKbay8xdSGmUtYLqOd1Q2MD8Pbqu70Fu+wdQMt3GcA70Byp0/X2xg0veADmDoTa/kWQYv X-Received: by 10.25.158.211 with SMTP id h202mr1818084lfe.29.1446721495097; Thu, 05 Nov 2015 03:04:55 -0800 (PST) Received: from localhost.localdomain ([195.238.92.128]) by smtp.gmail.com with ESMTPSA id xk9sm868550lbb.23.2015.11.05.03.04.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Nov 2015 03:04:54 -0800 (PST) From: Ivan Khoronzhuk To: lng-odp@lists.linaro.org Date: Thu, 5 Nov 2015 13:04:38 +0200 Message-Id: <1446721478-30656-7-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 6/6] api: time: change order of arguments for diff function 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" It's more convenient to pass parameters in order, like t2 - t1, when t2 is supposed to be more. Signed-off-by: Ivan Khoronzhuk --- example/generator/odp_generator.c | 2 +- include/odp/api/time.h | 4 ++-- platform/linux-generic/odp_schedule.c | 2 +- platform/linux-generic/odp_time.c | 2 +- test/performance/odp_pktio_perf.c | 10 +++++----- test/validation/pktio/pktio.c | 4 ++-- test/validation/time/time.c | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 0cb5cda..c06675f 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -604,7 +604,7 @@ static void print_global_stats(int num_workers) break; } - diff = odp_time_diff(start, odp_time_local()); + diff = odp_time_diff(odp_time_local(), start); if (odp_time_cmp(diff, wait) > 0) continue; diff --git a/include/odp/api/time.h b/include/odp/api/time.h index b3782b2..ba307d5 100644 --- a/include/odp/api/time.h +++ b/include/odp/api/time.h @@ -54,12 +54,12 @@ odp_time_t odp_time_local(void); /** * Time difference * - * @param t1 First time stamp * @param t2 Second time stamp + * @param t1 First time stamp * * @return Difference of time stamps */ -odp_time_t odp_time_diff(odp_time_t t1, odp_time_t t2); +odp_time_t odp_time_diff(odp_time_t t2, odp_time_t t1); /** * Time sum diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c index 98f7e9a..528844c 100644 --- a/platform/linux-generic/odp_schedule.c +++ b/platform/linux-generic/odp_schedule.c @@ -608,7 +608,7 @@ static int schedule_loop(odp_queue_t *out_queue, uint64_t wait, } time = odp_time_local(); - diff = odp_time_diff(start_time, time); + diff = odp_time_diff(time, start_time); if (odp_time_cmp(diff, wait) > 0) break; diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index 3fe0a5e..3b87e58 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -31,7 +31,7 @@ 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) +odp_time_t odp_time_diff(odp_time_t t2, odp_time_t t1) { return tick_to_time(_odp_cpu_cycles_diff(t1, t2)); } diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c index 531c94a..4bedeee 100644 --- a/test/performance/odp_pktio_perf.c +++ b/test/performance/odp_pktio_perf.c @@ -337,11 +337,11 @@ static void *run_thread_tx(void *arg) cur_time = odp_time_local(); start_time = cur_time; - burst_start_time = odp_time_diff(burst_gap, cur_time); - while (odp_time_diff(start_time, cur_time) < send_duration) { + burst_start_time = odp_time_diff(cur_time, burst_gap); + while (odp_time_diff(cur_time, start_time) < send_duration) { unsigned alloc_cnt = 0, tx_cnt; - if (odp_time_diff(burst_start_time, cur_time) < burst_gap) { + if (odp_time_diff(cur_time, burst_start_time) < burst_gap) { cur_time = odp_time_local(); if (!odp_time_cmp(ODP_TIME_NULL, idle_start)) idle_start = cur_time; @@ -349,7 +349,7 @@ static void *run_thread_tx(void *arg) } if (odp_time_cmp(ODP_TIME_NULL, idle_start)) { - odp_time_t diff = odp_time_diff(idle_start, cur_time); + odp_time_t diff = odp_time_diff(cur_time, idle_start); stats->s.idle_ticks = odp_time_sum(diff, stats->s.idle_ticks); @@ -600,7 +600,7 @@ static void busy_loop_ns(uint64_t wait_ns) odp_time_t wait = odp_time_local_from_ns(wait_ns); do { - diff = odp_time_diff(start_time, odp_time_local()); + diff = odp_time_diff(odp_time_local(), start_time); } while (odp_time_cmp(diff, wait) > 0); } diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c index 6a36100..0073d04 100644 --- a/test/validation/pktio/pktio.c +++ b/test/validation/pktio/pktio.c @@ -345,7 +345,7 @@ static odp_event_t queue_deq_wait_time(odp_queue_t queue, uint64_t ns) if (ev != ODP_EVENT_INVALID) return ev; now = odp_time_local(); - diff = odp_time_diff(start, now); + diff = odp_time_diff(now, start); } while (odp_time_to_ns(diff) < ns); return ODP_EVENT_INVALID; @@ -389,7 +389,7 @@ static odp_packet_t wait_for_packet(pktio_info_t *pktio_rx, } now = odp_time_local(); - diff = odp_time_diff(start, now); + diff = odp_time_diff(now, start); } while (odp_time_to_ns(diff) < ns); CU_FAIL("failed to receive transmitted packet"); diff --git a/test/validation/time/time.c b/test/validation/time/time.c index 9c79929..39c5ec8 100644 --- a/test/validation/time/time.c +++ b/test/validation/time/time.c @@ -27,7 +27,7 @@ void time_test_odp_diff(void) t2 = odp_time_local(); CU_ASSERT(odp_time_cmp(t1, t2) > 0); - diff = odp_time_diff(t1, t2); + diff = odp_time_diff(t2, t1); CU_ASSERT(odp_time_cmp(ODP_TIME_NULL, diff) > 0); } @@ -38,7 +38,7 @@ void time_test_odp_negative_diff(void) t1 = 10; t2 = 5; - diff = odp_time_diff(t1, t2); + diff = odp_time_diff(t2, t1); CU_ASSERT(odp_time_cmp(ODP_TIME_NULL, diff) > 0); }