From patchwork Wed Jan 24 04:00:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 125622 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp160964ljf; Tue, 23 Jan 2018 20:00:54 -0800 (PST) X-Google-Smtp-Source: AH8x224Z+ni1p/rmrYlAtv3DTfepotz+O6D030ckF09NcyliUFVben49a0tqTT94lcjx5BFtidB6 X-Received: by 10.200.49.183 with SMTP id h52mr7443839qte.281.1516766454016; Tue, 23 Jan 2018 20:00:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516766454; cv=none; d=google.com; s=arc-20160816; b=R0+G77KObD2Jan8UAWJzOrP1f9c83/dzDmwgOB7tVq+6iiC3DA4BzDZTG4hNSlZDSU OJKqzumU2BF/SEZT8wfe97LmLoeMp6uIZgQ5couoW+qNfIbBHd/oWeusNjjyxdVA8n2u PiC8QcCcmu9xFY1/l6PklvU0EF3G4j3hqy/q+BUKbfl9Tui60BTqjMgByCjJvjvpB9eB jUFB4kgMxSzw5WGu6RAiGIF2FA2ezSEtV4enI3Iy/USeGiRxqNwuVwkPeSyt4URrQN28 llrJO85NqeW8H7H7Gh6y6psunDFcqYURCjzOaPYWkhcJUDY9OWmBb2ZUKp+GwBzDGycW Iv4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=edsYxGpsLlVrOPNiosoG4QvkCKysmDDl1zzAiUzyX0M=; b=VAIFx/YpwKs02sE3nSbhCblcl+Ld/C7Fy8TNI6ZKDSSIqZav61YEwlskCDUsriBOwW Z02SxNS8EP4ykrM12wAc7z371NssNGUVH/F/pExkIOv/krB36Oul41mPXdt2sJ/e+NZ+ 5e977S6vuPz+Pwym3FKfYJQEvl1o0Z/T3pOPepkOcEM1Y14nixMqKI8NPoVDOPjCJqwj qOUtLO6q4sK/YcGO7HANT7FlO/thkGBOQQbg1qNTifEv2GQJvAonahALpqMUAPb/F+YL F5+XaW6L/y7/24M4QnsCBxPw8csgQGJbIshBLTdtxv6Uou2/TOf2bRuxpFcoSsYdjJSp eljg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id v36si967776qtb.28.2018.01.23.20.00.53; Tue, 23 Jan 2018 20:00:54 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id AC692617F1; Wed, 24 Jan 2018 04:00:53 +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,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 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 EE4AC616F9; Wed, 24 Jan 2018 04:00:21 +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 27D9461510; Wed, 24 Jan 2018 04:00:16 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id 1FCB160855 for ; Wed, 24 Jan 2018 04:00:15 +0000 (UTC) Received: from mxback6g.mail.yandex.net (mxback6g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:167]) by forward101j.mail.yandex.net (Yandex) with ESMTP id B907B1242C47 for ; Wed, 24 Jan 2018 07:00:13 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback6g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id KEg0LfC9mx-0D4uD88W; Wed, 24 Jan 2018 07:00:13 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Hjnrz6Pror-0DN4XhAD; Wed, 24 Jan 2018 07:00:13 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 24 Jan 2018 07:00:09 +0300 Message-Id: <1516766411-32193-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516766411-32193-1-git-send-email-odpbot@yandex.ru> References: <1516766411-32193-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 410 Subject: [lng-odp] [PATCH API-NEXT v4 1/3] test: validation: drop use of indefinite wait in pktio test 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Bill Fischofer Drop use of deprecated ODP_PKTIN_WAIT timeout option in pktio tests. Signed-off-by: Bill Fischofer --- /** Email created from pull request 410 (Bill-Fischofer-Linaro:pktio-dropwait) ** https://github.com/Linaro/odp/pull/410 ** Patch: https://github.com/Linaro/odp/pull/410.patch ** Base sha: 44974a09b01c79adb9637a5dff38539598a76737 ** Merge commit sha: 3cf0180857e56f4f99a4435004bdcf7303b584a4 **/ test/validation/api/pktio/pktio.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index c144294b5..6592b2600 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -554,10 +554,8 @@ static int recv_packets_tmo(odp_pktio_t pktio, odp_packet_t pkt_tbl[], CU_ASSERT(from_val < (unsigned)num_q); } while (num_rx < num); - if (tmo == ODP_PKTIN_WAIT) - CU_ASSERT(num_rx == num); if (num_rx < num) - CU_ASSERT(odp_time_to_ns(odp_time_diff(ts2, ts1)) >= ns); + CU_ASSERT(odp_time_diff_ns(ts2, ts1) >= ns); return num_rx; } @@ -981,7 +979,7 @@ static void test_recv_tmo(recv_tmo_mode_e mode) CU_ASSERT_FATAL(ret == test_pkt_count); ret = recv_packets_tmo(pktio_rx, &pkt_tbl[0], &pkt_seq[0], 1, mode, - ODP_PKTIN_WAIT, 0); + odp_pktin_wait_time(UINT64_MAX), 0); CU_ASSERT_FATAL(ret == 1); ret = recv_packets_tmo(pktio_rx, &pkt_tbl[1], &pkt_seq[1], 1, mode,