From patchwork Thu Aug 27 12:31:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 52762 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 0657122DC4 for ; Thu, 27 Aug 2015 12:33:51 +0000 (UTC) Received: by wicne3 with SMTP id ne3sf8007034wic.1 for ; Thu, 27 Aug 2015 05:33:50 -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: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=Bk7dZS1AaFCY14QXj0Hm05yPWoN4H6xTwGqLrZGoYn8=; b=Iuv+BJBBjx/SuqM8ZcI3BIKooQNbYZIKIrGpeMGm8kVPxB7g2IN+cDHm6ifJM5iXzM vJYOIRRNzgJwJZscZoqN6lStXpnsWMFfEwG9G7qXxhMX1cFmPlLvbTF3di7CfMONo9Qz OCvbcIYTzsPRYpVmXECdYpLRms70jhonbWpZnrkFszSmUGyqVtIaXGI1WAgWQkoSck8m luU9qaHxYA1RRFg5OcUBLK0ALNzFYYSawjPzUpf9UiIxsUCgZOAtHo3frJWvD/BA/egu spKLF1bTTIKgHNC76KsoCmOLhS013wrlF/aeFRgU5U89NcTkA7dEFYGhS0hNDBYcbdxe qkjw== X-Gm-Message-State: ALoCoQlk05jnFtRY0kgqGZQzO6MM+cA/HETFRHCMPvLJc9fxg2eY/GDTq5JpWGEab/RwgL2xjJjS X-Received: by 10.112.135.104 with SMTP id pr8mr1190499lbb.4.1440678830346; Thu, 27 Aug 2015 05:33:50 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.44.169 with SMTP id f9ls72887lam.93.gmail; Thu, 27 Aug 2015 05:33:50 -0700 (PDT) X-Received: by 10.152.21.71 with SMTP id t7mr2067105lae.118.1440678830211; Thu, 27 Aug 2015 05:33:50 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id l1si2007131lbj.175.2015.08.27.05.33.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Aug 2015 05:33:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by labns7 with SMTP id ns7so11465783lab.0 for ; Thu, 27 Aug 2015 05:33:50 -0700 (PDT) X-Received: by 10.152.170.230 with SMTP id ap6mr2122042lac.73.1440678830085; Thu, 27 Aug 2015 05:33:50 -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.162.200 with SMTP id yc8csp4612355lbb; Thu, 27 Aug 2015 05:33:49 -0700 (PDT) X-Received: by 10.50.93.102 with SMTP id ct6mr8808033igb.75.1440678828493; Thu, 27 Aug 2015 05:33:48 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id t3si1833478igm.25.2015.08.27.05.33.47; Thu, 27 Aug 2015 05:33:48 -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 31D7C62181; Thu, 27 Aug 2015 12:33:47 +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.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 [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 98C4162189; Thu, 27 Aug 2015 12:33:20 +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 5513E62164; Thu, 27 Aug 2015 12:33:16 +0000 (UTC) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com [209.85.217.181]) by lists.linaro.org (Postfix) with ESMTPS id AF67761FD3 for ; Thu, 27 Aug 2015 12:31:28 +0000 (UTC) Received: by lbcbn3 with SMTP id bn3so10284218lbc.2 for ; Thu, 27 Aug 2015 05:31:27 -0700 (PDT) X-Received: by 10.112.140.132 with SMTP id rg4mr2045021lbb.49.1440678687629; Thu, 27 Aug 2015 05:31:27 -0700 (PDT) Received: from khorivan.synapse.com ([195.238.92.128]) by smtp.gmail.com with ESMTPSA id qy6sm544440lbc.26.2015.08.27.05.31.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 27 Aug 2015 05:31:26 -0700 (PDT) From: Ivan Khoronzhuk To: lng-odp@lists.linaro.org Date: Thu, 27 Aug 2015 15:31:19 +0300 Message-Id: <1440678679-13134-1-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 1.9.1 X-Topics: patch Subject: [lng-odp] [Patch] validation: pktio: don't mix scheduler wait time and ns 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.43 as permitted sender) smtp.mailfrom=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 odp_schduler() requires time value in it`s own ticks, so path scheduler wait time instead of ns. Signed-off-by: Ivan Khoronzhuk Reviewed-by: Stuart Haslam --- test/validation/pktio/pktio.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c index cb2a9ed..7c0c812 100644 --- a/test/validation/pktio/pktio.c +++ b/test/validation/pktio/pktio.c @@ -342,15 +342,17 @@ static odp_packet_t wait_for_packet(odp_queue_t queue, uint64_t start, now, diff; odp_event_t ev; odp_packet_t pkt = ODP_PACKET_INVALID; + uint64_t wait; start = odp_time_cycles(); + wait = odp_schedule_wait_time(ns); do { if (queue != ODP_QUEUE_INVALID && odp_queue_type(queue) == ODP_QUEUE_TYPE_POLL) ev = queue_deq_wait_time(queue, ns); else - ev = odp_schedule(NULL, ns); + ev = odp_schedule(NULL, wait); if (ev != ODP_EVENT_INVALID) { if (odp_event_type(ev) == ODP_EVENT_PACKET) { @@ -566,6 +568,7 @@ void pktio_test_inq_remdef(void) odp_pktio_t pktio = create_pktio(iface_name[0], 0); odp_queue_t inq; odp_event_t ev; + uint64_t wait; int i; CU_ASSERT(pktio != ODP_PKTIO_INVALID); @@ -574,8 +577,9 @@ void pktio_test_inq_remdef(void) CU_ASSERT(inq != ODP_QUEUE_INVALID); CU_ASSERT(odp_pktio_inq_remdef(pktio) == 0); + wait = odp_schedule_wait_time(ODP_TIME_SEC); for (i = 0; i < 100; i++) { - ev = odp_schedule(NULL, ODP_TIME_MSEC); + ev = odp_schedule(NULL, wait); if (ev != ODP_EVENT_INVALID) { odp_buffer_free(odp_buffer_from_event(ev)); CU_FAIL("received unexpected event");