From patchwork Fri Dec 4 17:51:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 57720 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp703902lbb; Fri, 4 Dec 2015 09:58:02 -0800 (PST) X-Received: by 10.55.79.69 with SMTP id d66mr20082586qkb.76.1449251881945; Fri, 04 Dec 2015 09:58:01 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id t17si14223543qhb.14.2015.12.04.09.58.01; Fri, 04 Dec 2015 09:58: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 845EF62D71; Fri, 4 Dec 2015 17:58: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 6DF6462D82; Fri, 4 Dec 2015 17:53: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 E6F3662D87; Fri, 4 Dec 2015 17:53:01 +0000 (UTC) Received: from mail-lf0-f52.google.com (mail-lf0-f52.google.com [209.85.215.52]) by lists.linaro.org (Postfix) with ESMTPS id 7989B62D71 for ; Fri, 4 Dec 2015 17:51:55 +0000 (UTC) Received: by lfs39 with SMTP id 39so113690383lfs.3 for ; Fri, 04 Dec 2015 09:51:54 -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=YrHumAXWmPGpK3mYR/eLnA8q87hnlplP88eyPFCvIhA=; b=g+wWKtTbJ9RoU6pwjwwQPvTvZ3BhLTWQo4Zk6u32KwsbLWsDP9SVoaJWYOdgUZIR+F vrWP7YH7xsS73y6h3Sz/QugImgsPPdYWrY3lVYtSXZi5EAGdrFw5FtwQKMcrIkVZjB4Y tVzZngEWXce7b3Q3SwGB8JVFKfcVGzUKpmKW2FP5aKIU4KkU6nNEtS9q0JOx67Yj0kiW ++Zx9RvrgK5iPe0DEx2oWPHQldUtUmI0n61ukbY1Yv2bic7SWmBoqp4WgRQuCEJeqkVh wVApOokkndI4LupdUvSIY9l+PBGt6wZopSJIEbXLRDYoPbA5rtOj6RGXhOuAuKU15oNQ KSng== 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=YrHumAXWmPGpK3mYR/eLnA8q87hnlplP88eyPFCvIhA=; b=dPzzFbq57jruQvJuok4plDOcgRPk9/eYXeHZtdeDS+xaTRxLqH/HxZ86P0cwaDEGVB wddZUFDfZjE6GTj3SCU4U0FyvUsvhV0itP1wfpBRSu0upzsG5voYWeyONYK8Ph5+Zb4S tA7UqoICnXOzNSp8opwP0dc5WR8fP1v36Kv7k6ZZbUgnOZ0c66VB3UzZQSN5/Y4u2W5s lZjDlHlzpKGfSVnKb9xZSm8+x1BPgZZhMVIQfDDrQVNuxsQYTX2OsPIsZQYcblp+HtK1 xCb+8TN/4GWlw/BNr/2FBXbSbOzHtWZvfMFJzh8O8dq5WsBbxhgCLcWmMxnyQTDhIOjF iD8Q== X-Gm-Message-State: ALoCoQmaE/JYlDgYNaQ0DR6yxHRAgYqasEUj7o+qeS0luv4S4GsLjNFFAJnMSvzL/WWzl5qAzSCF X-Received: by 10.25.138.68 with SMTP id m65mr8662543lfd.69.1449251514340; Fri, 04 Dec 2015 09:51:54 -0800 (PST) Received: from localhost.localdomain ([212.90.60.8]) by smtp.gmail.com with ESMTPSA id rm5sm2483518lbb.20.2015.12.04.09.51.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Dec 2015 09:51:53 -0800 (PST) From: Ivan Khoronzhuk To: lng-odp@lists.linaro.org Date: Fri, 4 Dec 2015 19:51:34 +0200 Message-Id: <1449251494-23210-10-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449251494-23210-1-git-send-email-ivan.khoronzhuk@linaro.org> References: <1449251494-23210-1-git-send-email-ivan.khoronzhuk@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCH v7 9/9] test/example: use local time API as wall time 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 local time API is supposed to behave like wall time now, so correct it in examples and tests. Reviewed-by: Petri Savolainen Signed-off-by: Ivan Khoronzhuk --- example/generator/odp_generator.c | 10 +++++----- test/performance/odp_pktio_perf.c | 27 ++++++++++++--------------- test/validation/pktio/pktio.c | 21 ++++++++------------- 3 files changed, 25 insertions(+), 33 deletions(-) diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 9d79f89..2de530d 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -586,7 +586,7 @@ static void *gen_recv_thread(void *arg) */ static void print_global_stats(int num_workers) { - odp_time_t start, wait, diff; + odp_time_t cur, wait, next; uint64_t pkts, pkts_prev = 0, pps, maximum_pps = 0; int verbose_interval = 20; odp_thrmask_t thrd_mask; @@ -595,7 +595,7 @@ static void print_global_stats(int num_workers) continue; wait = odp_time_local_from_ns(verbose_interval * ODP_TIME_SEC_IN_NS); - start = odp_time_local(); + next = odp_time_sum(odp_time_local(), wait); while (odp_thrmask_worker(&thrd_mask) == num_workers) { if (args->appl.number != -1 && @@ -604,11 +604,11 @@ static void print_global_stats(int num_workers) break; } - diff = odp_time_diff(odp_time_local(), start); - if (odp_time_cmp(wait, diff) > 0) + cur = odp_time_local(); + if (odp_time_cmp(next, cur) > 0) continue; - start = odp_time_local(); + next = odp_time_sum(cur, wait); if (args->appl.mode == APPL_MODE_RCV) { pkts = odp_atomic_load_u64(&counters.udp); diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c index ec67d55..8737bc8 100644 --- a/test/performance/odp_pktio_perf.c +++ b/test/performance/odp_pktio_perf.c @@ -305,8 +305,8 @@ static void *run_thread_tx(void *arg) int thr_id; odp_queue_t outq; pkt_tx_stats_t *stats; - odp_time_t start_time, cur_time, send_duration; - odp_time_t burst_start_time, burst_gap; + odp_time_t cur_time, send_time_end, send_duration; + odp_time_t burst_gap_end, burst_gap; uint32_t batch_len; int unsent_pkts = 0; odp_event_t tx_event[BATCH_LEN_MAX]; @@ -336,22 +336,19 @@ static void *run_thread_tx(void *arg) odp_barrier_wait(&globals->tx_barrier); cur_time = odp_time_local(); - start_time = cur_time; - burst_start_time = odp_time_diff(cur_time, burst_gap); - while (odp_time_cmp(send_duration, - odp_time_diff(cur_time, start_time)) > 0) { + send_time_end = odp_time_sum(cur_time, send_duration); + burst_gap_end = cur_time; + while (odp_time_cmp(send_time_end, cur_time) > 0) { unsigned alloc_cnt = 0, tx_cnt; - if (odp_time_cmp(burst_gap, - odp_time_diff(cur_time, burst_start_time)) - > 0) { + if (odp_time_cmp(burst_gap_end, cur_time) > 0) { cur_time = odp_time_local(); if (!odp_time_cmp(idle_start, ODP_TIME_NULL)) idle_start = cur_time; continue; } - if (odp_time_cmp(idle_start, ODP_TIME_NULL)) { + if (odp_time_cmp(idle_start, ODP_TIME_NULL) > 0) { odp_time_t diff = odp_time_diff(cur_time, idle_start); stats->s.idle_ticks = @@ -360,7 +357,7 @@ static void *run_thread_tx(void *arg) idle_start = ODP_TIME_NULL; } - burst_start_time = odp_time_sum(burst_start_time, burst_gap); + burst_gap_end = odp_time_sum(burst_gap_end, burst_gap); alloc_cnt = alloc_packets(tx_event, batch_len - unsent_pkts); if (alloc_cnt != batch_len) @@ -598,13 +595,13 @@ static int setup_txrx_masks(odp_cpumask_t *thd_mask_tx, */ static void busy_loop_ns(uint64_t wait_ns) { - odp_time_t diff; - odp_time_t start_time = odp_time_local(); odp_time_t wait = odp_time_local_from_ns(wait_ns); + odp_time_t cur = odp_time_local(); + odp_time_t end_time = odp_time_sum(cur, wait); do { - diff = odp_time_diff(odp_time_local(), start_time); - } while (odp_time_cmp(wait, diff) > 0); + cur = odp_time_local(); + } while (odp_time_cmp(end_time, cur) > 0); } /* diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c index 0a6592c..002c26b 100644 --- a/test/validation/pktio/pktio.c +++ b/test/validation/pktio/pktio.c @@ -336,18 +336,16 @@ static int destroy_inq(odp_pktio_t pktio) static odp_event_t queue_deq_wait_time(odp_queue_t queue, uint64_t ns) { - odp_time_t start, now, diff; + odp_time_t wait, end; odp_event_t ev; - start = odp_time_local(); - + wait = odp_time_local_from_ns(ns); + end = odp_time_sum(odp_time_local(), wait); do { ev = odp_queue_deq(queue); if (ev != ODP_EVENT_INVALID) return ev; - now = odp_time_local(); - diff = odp_time_diff(now, start); - } while (odp_time_to_ns(diff) < ns); + } while (odp_time_cmp(end, odp_time_local()) > 0); return ODP_EVENT_INVALID; } @@ -355,14 +353,14 @@ static odp_event_t queue_deq_wait_time(odp_queue_t queue, uint64_t ns) static odp_packet_t wait_for_packet(pktio_info_t *pktio_rx, uint32_t seq, uint64_t ns) { - odp_time_t start, now, diff; + odp_time_t wait_time, end; odp_event_t ev; odp_packet_t pkt; uint64_t wait; - start = odp_time_local(); wait = odp_schedule_wait_time(ns); - + wait_time = odp_time_local_from_ns(ns); + end = odp_time_sum(odp_time_local(), wait_time); do { pkt = ODP_PACKET_INVALID; @@ -388,10 +386,7 @@ static odp_packet_t wait_for_packet(pktio_info_t *pktio_rx, odp_packet_free(pkt); } - - now = odp_time_local(); - diff = odp_time_diff(now, start); - } while (odp_time_to_ns(diff) < ns); + } while (odp_time_cmp(end, odp_time_local()) > 0); CU_FAIL("failed to receive transmitted packet");