From patchwork Wed Jan 24 21:00:18 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: 125712 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp663355ljf; Wed, 24 Jan 2018 13:00:35 -0800 (PST) X-Google-Smtp-Source: AH8x225vxz3qnjzYf+/bzBvz74MxU4UJEVP0yJ+YzysNaytvj+60MEn1cf1z/Kkd7Hg/iqRzF74P X-Received: by 10.200.19.74 with SMTP id f10mr4538198qtj.72.1516827634859; Wed, 24 Jan 2018 13:00:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516827634; cv=none; d=google.com; s=arc-20160816; b=jgTgtE26p35bbTfb1nZ6k3B8ViJEAmE1qhvTPQZcr+t2yAs/ud+J0PyGBQJBfxRXdO tL6MdwD6rWc8pPHuOsP0YofTY7j2ZAAMRANURDd0qQ3JXBHU7kJfiCY7fCwdoF/vumMP lYORtG8v9vUoz9aKt0WVExTvcVJsKh/92+vp0RFljKcQkjyp36bziiWRqM7FyUfSMXpy 9O8zrhMOQp66zplmjdOdWl6BdvsXyOMJMInmRYGOsi+qxgKGVt233C16hZmk7jB8aZTx FyXJ54EfHiK2j2QOqmbctHV6zgH3k9PbXOWm0zUksa1JHGHDj2YyvH82W0I27QN+2Wyj DIAg== 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=2h1KKsdJDiY/urbOpqqyP1TgVwzKcVa13FJDmnTsG18=; b=08+8+G67DlUhCyquMoMYYFN6/SmkhMjI46d6Yvfe+u7U83ySb8B/G68hWOLCZvIq2h KpKcZuKzkhV2Aev/LpY8Xfcv7zw62ADDtgJcVN+o5GUwbwcl+2Dw2r60fMBTU8Kyccwg sI96SnQ6nmesy/HN/LBilddZdkAmYaPAsJaHHyK/T/wPs6iTrLtb0t7hhYgfSLd2ud78 69Blv7DMgmVkTPcwh1XXudxxzkp+1elT4qft5WDPAo5cKh76RjQQL/m8KEgYXnEDpwpg 3OlDX7tzCQUjzZFprdOmPfaT0XIYTJohcTmu/5qMCRJMYapkln5LPOlkGUgAMIJCS9QK cofQ== 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 k2si3691687qtf.40.2018.01.24.13.00.34; Wed, 24 Jan 2018 13:00:34 -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 AFE396176F; Wed, 24 Jan 2018 21:00:33 +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_H3, RCVD_IN_MSPIKE_WL 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 3E1D060929; Wed, 24 Jan 2018 21:00:28 +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 7BEB3609A8; Wed, 24 Jan 2018 21:00:25 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 1D7596062E for ; Wed, 24 Jan 2018 21:00:24 +0000 (UTC) Received: from mxback9g.mail.yandex.net (mxback9g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:170]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 8CF3B184F05 for ; Thu, 25 Jan 2018 00:00:22 +0300 (MSK) Received: from smtp2o.mail.yandex.net (smtp2o.mail.yandex.net [2a02:6b8:0:1a2d::26]) by mxback9g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 717qLwFNju-0Mm4MuAx; Thu, 25 Jan 2018 00:00:22 +0300 Received: by smtp2o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id cBLphPGQu0-0LWq5JWd; Thu, 25 Jan 2018 00:00:21 +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: Thu, 25 Jan 2018 00:00:18 +0300 Message-Id: <1516827620-4105-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516827620-4105-1-git-send-email-odpbot@yandex.ru> References: <1516827620-4105-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 410 Subject: [lng-odp] [PATCH API-NEXT v5 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: 13b0f1705d8327e73979c073c91b9b72984873fb **/ 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,