From patchwork Fri Jan 19 18:00:06 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: 125202 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp404689ljf; Fri, 19 Jan 2018 10:00:52 -0800 (PST) X-Google-Smtp-Source: ACJfBotAeBViAwTLpJbLfJxoXzY67kXxj75l83AoxXCZ4sfUf7PWZIgP/ScFI5mT93boh34sigXj X-Received: by 10.200.57.228 with SMTP id v91mr26611475qte.121.1516384852719; Fri, 19 Jan 2018 10:00:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516384852; cv=none; d=google.com; s=arc-20160816; b=DLdwTHKImTc0Z0bJNaXAHBF0oP31AvhwOl3gxAv0dMQEn9fHGTw8r+yQ1VhwB8L3k2 gaji8wnCeh8SsCj0N/Voa2F4eeEseVua5fkwexcbfoKVvOC+tclB2wjb3r1UGK6RyBgl JXSbR25RXvRAclLu/rixMbggzyCod4HUAGPASrimcdcl2bCBNxbVQ0Sm9HWTPsFfkux0 pRzMIxl5Jpmp2xUwR3QpYZVz/ERJpGVEOKq/IQVfZNADfHosECFcGtR9u+KIWFsVAgmc mLHSW4n/zqX0bBikPctLjBtf+ViX6Api0t8NuolgC0ZJQRZp7uJMQ7qf4lKfwh6Q3Hui c9/Q== 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=imPyLZZ0mBnZaKJCvXvW/lRkfgQmPRllpNl+ei7jZx4=; b=IupgEy9tDaFMwhWBUili6Rfl2uCAhlJXSmZnoShYDTzykJqwXTDExHVgCoGAi/gpQ4 H2iyIUKJMgEwjzzjjdTp/BrOxmtqNrPYAJ8NT1sExcr1WcK0+QSUslUeeU4f7XV5Bl0m f9g+TVq76d/M5PvYLaS7gdFD3obfV4BhJBmKlaFyhpiNI4xNmFuk/jPiqHa26Bc7VAj+ 8sYxpaQ5R2mulmeRMAx2JBZ3F91RCUmnAx2npU2ipXOIZ8KT6Gs4SU/jU1cZw0FAlmBc cH5zWTHovRytRKIupCo4TMUtwXXpsrPz7E6KBFON6i4Yac5s4Z8T97gJCuQVrLkql2IK QIXQ== 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 a54si8395555qtk.85.2018.01.19.10.00.52; Fri, 19 Jan 2018 10:00:52 -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 50C03610A7; Fri, 19 Jan 2018 18:00:52 +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 0CD40609BB; Fri, 19 Jan 2018 18:00:19 +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 7D9606096B; Fri, 19 Jan 2018 18:00:13 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 9F65A60887 for ; Fri, 19 Jan 2018 18:00:11 +0000 (UTC) Received: from mxback6j.mail.yandex.net (mxback6j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10f]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 77E2018521B for ; Fri, 19 Jan 2018 21:00:10 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback6j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id aCfgvS7pi5-0A64o1v6; Fri, 19 Jan 2018 21:00:10 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id C1ktYf9cEI-09nSjB5b; Fri, 19 Jan 2018 21:00:09 +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: Fri, 19 Jan 2018 21:00:06 +0300 Message-Id: <1516384808-21464-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516384808-21464-1-git-send-email-odpbot@yandex.ru> References: <1516384808-21464-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 410 Subject: [lng-odp] [PATCH API-NEXT v2 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: f925f103c90591776f73863d30159357b08bf71e ** Merge commit sha: c12e1d598d6122e11132871b9b1b9d437129e307 **/ 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..9cd111d38 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); + UINT64_MAX, 0); CU_ASSERT_FATAL(ret == 1); ret = recv_packets_tmo(pktio_rx, &pkt_tbl[1], &pkt_seq[1], 1, mode,