From patchwork Mon Jan 22 16:00:27 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: 125445 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp1233781ljf; Mon, 22 Jan 2018 08:07:14 -0800 (PST) X-Google-Smtp-Source: AH8x224gM6YxzRBdHFSoMzUWgKtIS+oYaT4c5Z/VsPW6pb8IkwzTNKPxSqRGW8x2buxdYKvCsNVP X-Received: by 10.55.138.68 with SMTP id m65mr10132537qkd.166.1516637234755; Mon, 22 Jan 2018 08:07:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516637234; cv=none; d=google.com; s=arc-20160816; b=Bzj6zlApg+DeUZHUHM0/rpHzkJGlyXsFmltrvEIZ60Dx7c9qG8at+xyrr6I+8Bppbc CKKz1aaqnz3WKdmBw1BXvy+BLVNBJlu+7oyj11OjCptb+HGSe4RC0gSOPFj0YeGfXE6H sOgr7UsfKHEHRgoQi/3LyQazdFcqpXhlCAu3O4zhKnYXB36Ty7V5tFIbBBXKCPS3peHf mMpAGX5hxhhtnAkbjsmPLcvu2V2MabBw931eBe0rtEpeks0c2MP+ItvFL07kUW8JHKc5 9bGsg3+Y4tZyUXjeiz9z5pK46adOQkQBS6j7NZAhgglzY/cPiL/UIthOXFs8T2Erq4Ew 01Mw== 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=RJdMfNH+87VdXHPSE8tueRlr8xu46bCb1wyNEHlme1Q=; b=y1G/i4rKl5hZ1BRvLfUEW4o/l5jlF07uly3v6tiT6uINNy8QwhSMN9BXJuHvtKwOhl vlHyytDeVfbvVghPXqbd5htVr5Q9hRG1iHReRBUcC8ybj2NUEKpfqrZcCc9WfzOdYm1A Z6tA93oVW7RL1xNVULTu/ITzAjovWy30lHxKhuaXQ3IyIxrxRd0o3lhjU3pqpBIy7ga8 x516mfLCgH7mp0MFAAJYtVV9giFMTcysLzbl4Ax8wPVDLliX6kPTgeR6fKmxebgglB10 xjVs3KBYl0zbCMk9nbMUmFqlsivoL4xWeA4mn1iHCf5Hsv0iAcYygG2CpAHyTT5+OonE 5hQA== 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 c27si49679qtc.462.2018.01.22.08.07.14; Mon, 22 Jan 2018 08:07:14 -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 5F7B561805; Mon, 22 Jan 2018 16:07:14 +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 3162C6277A; Mon, 22 Jan 2018 16:02:11 +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 3CE8C6277D; Mon, 22 Jan 2018 16:01:59 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id F07A0617E8 for ; Mon, 22 Jan 2018 16:00:31 +0000 (UTC) Received: from mxback4g.mail.yandex.net (mxback4g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:165]) by forward100o.mail.yandex.net (Yandex) with ESMTP id E2E292A218ED for ; Mon, 22 Jan 2018 19:00:30 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback4g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id DExBQMxDc6-0UdWX7rS; Mon, 22 Jan 2018 19:00:30 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id O0cKlvvIDP-0Uoml61w; Mon, 22 Jan 2018 19:00:30 +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: Mon, 22 Jan 2018 19:00:27 +0300 Message-Id: <1516636829-25161-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516636829-25161-1-git-send-email-odpbot@yandex.ru> References: <1516636829-25161-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 410 Subject: [lng-odp] [PATCH API-NEXT v3 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: 5fba303faf04d29b616f687ce1f721400b2c6f9c ** Merge commit sha: d3ec5308bd5a6917dc91dee1860dab99bd6e9b15 **/ test/validation/api/pktio/pktio.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index c144294b5..5f9b11fd9 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -554,10 +554,7 @@ 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(num_rx == num || odp_time_diff_ns(ts2, ts1) >= ns); return num_rx; } @@ -981,7 +978,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,