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, From patchwork Fri Jan 19 18:00:07 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: 125204 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp405866ljf; Fri, 19 Jan 2018 10:02:44 -0800 (PST) X-Google-Smtp-Source: AH8x224gvkW/Lhkk3/CGsqe0b55M0Z9xJgPSBO5SAMUwtYmaDj54Dur4sNg6pKnBDnT6dvwoiJs5 X-Received: by 10.13.242.134 with SMTP id b128mr514166ywf.51.1516384964697; Fri, 19 Jan 2018 10:02:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516384964; cv=none; d=google.com; s=arc-20160816; b=fcy78zSuuFf2VSN7lXUtyESiEWb4G6G2Xp3n4razgs37PkrpGvT5zLmqkFPUj+tbsp hqqVzxMZEm+KbP73VEq8nFpJWewF2w2kyNBBpHRU5IockKSpCWj51odiPJXZgKU8QyPk Ye/KtryF1XN0Pj/e+W4fVYZr7RTBsW2Cm1SwfOvzrxlWpqqPruQ/vsPUUq4aqjob/aNq gqviA9VMJZdjC8aH7duabJ1dOo5D0ts3J59+1RUUq7eAoCq11XnO5YzNjyODyjsEmo9B 0J0Ta0A/Ukq78lpnHm+GHx5b4PmijEZGsOxSnh9gdGqEVDHOL4B/kSjNomziB0gTGP0s PjqQ== 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=6PiC+XhGikl1z7Jee0BhDdePToQG/pK6Ji9rfbrKKpc=; b=wn/Wc3Md+eHhIFvORjHk/TWFs9e7cjyy+wnsBfd0JX/hoc7eRtarejhTUuy0ekwQgc wReQx/UTh58w9F6KpOgrNt+vpMeZu+xV+fE02IMPZ0jHcTYRM42hO2DtdCrqJkkHnpiT tpGSkrETM3VCEe+uSnIHkvy1vGsdSSmlwOJpTbjbnLfJOlkcQNdahtI1hWP0MS3VcpJd Af7YG1PC4VoUyqG9TgQF2V1//x9wk2JLMk8x81PgbW5G3jzQLSjOXSy56CzUhcM3N3/O RWwVL6yQKqHChUYos3p8KgS7fLryyyPrc8WjGlqlgFKSwdUjTcG/zp/AO1Kn26pq7Y4/ 30yg== 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 v187si2955920qkd.426.2018.01.19.10.02.44; Fri, 19 Jan 2018 10:02:44 -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 4FD5D6151E; Fri, 19 Jan 2018 18:02:44 +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 D48D8616E3; Fri, 19 Jan 2018 18: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 52F5B60C5E; Fri, 19 Jan 2018 18:00:20 +0000 (UTC) Received: from forward102o.mail.yandex.net (forward102o.mail.yandex.net [37.140.190.182]) by lists.linaro.org (Postfix) with ESMTPS id 8E08E608E6 for ; Fri, 19 Jan 2018 18:00:12 +0000 (UTC) Received: from mxback12g.mail.yandex.net (mxback12g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:91]) by forward102o.mail.yandex.net (Yandex) with ESMTP id 26A6E5A04F50 for ; Fri, 19 Jan 2018 21:00:11 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback12g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id g7F20F02Ct-0BXW0t2c; Fri, 19 Jan 2018 21:00:11 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id C1ktYf9cEI-0AnepKkN; Fri, 19 Jan 2018 21:00:10 +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:07 +0300 Message-Id: <1516384808-21464-3-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 2/3] linux-generic: pktio: drop support for indefinite waits in recv_tmo 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 support for the deprecated ODP_PKTIN_WAIT option on odp_pktin_recv_tmo() and odp_pktin_recv_mq_tmo() 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 **/ include/odp/api/abi-default/packet_io.h | 1 - platform/linux-generic/odp_packet_io.c | 65 +++++++++++++---------------- platform/linux-generic/pktio/pktio_common.c | 3 +- platform/linux-generic/pktio/socket.c | 6 +-- platform/linux-generic/pktio/socket_mmap.c | 6 +-- 5 files changed, 34 insertions(+), 47 deletions(-) diff --git a/include/odp/api/abi-default/packet_io.h b/include/odp/api/abi-default/packet_io.h index 4795f8fc3..7cd3edd75 100644 --- a/include/odp/api/abi-default/packet_io.h +++ b/include/odp/api/abi-default/packet_io.h @@ -46,7 +46,6 @@ typedef struct odp_pktout_queue_t { #define ODP_PKTIO_MACADDR_MAXSIZE 16 #define ODP_PKTIN_NO_WAIT 0 -#define ODP_PKTIN_WAIT UINT64_MAX /** * @} diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 095f6be12..a06fa67b4 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1699,33 +1699,28 @@ int odp_pktin_recv_tmo(odp_pktin_queue_t queue, odp_packet_t packets[], int num, while (1) { ret = entry->s.ops->recv(entry, queue.index, packets, num); - if (ret != 0) + if (ret != 0 || wait == 0) return ret; - if (wait == 0) - return 0; + /* Avoid unnecessary system calls. Record the start time + * only when needed and after the first call to recv. */ + if (odp_unlikely(!started)) { + odp_time_t t; - if (wait != ODP_PKTIN_WAIT) { - /* Avoid unnecessary system calls. Record the start time - * only when needed and after the first call to recv. */ - if (odp_unlikely(!started)) { - odp_time_t t; - - t = odp_time_local_from_ns(wait * 1000); - started = 1; - t1 = odp_time_sum(odp_time_local(), t); - } + t = odp_time_local_from_ns(wait * 1000); + started = 1; + t1 = odp_time_sum(odp_time_local(), t); + } - /* Check every SLEEP_CHECK rounds if total wait time - * has been exceeded. */ - if ((++sleep_round & (SLEEP_CHECK - 1)) == 0) { - t2 = odp_time_local(); + /* Check every SLEEP_CHECK rounds if total wait time + * has been exceeded. */ + if ((++sleep_round & (SLEEP_CHECK - 1)) == 0) { + t2 = odp_time_local(); - if (odp_time_cmp(t2, t1) > 0) - return 0; - } - wait = wait > SLEEP_USEC ? wait - SLEEP_USEC : 0; + if (odp_time_cmp(t2, t1) > 0) + return 0; } + wait = wait > SLEEP_USEC ? wait - SLEEP_USEC : 0; nanosleep(&ts, NULL); } @@ -1779,25 +1774,23 @@ int odp_pktin_recv_mq_tmo(const odp_pktin_queue_t queues[], unsigned num_q, if (wait == 0) return 0; - if (wait != ODP_PKTIN_WAIT) { - if (odp_unlikely(!started)) { - odp_time_t t; + if (odp_unlikely(!started)) { + odp_time_t t; - t = odp_time_local_from_ns(wait * 1000); - started = 1; - t1 = odp_time_sum(odp_time_local(), t); - } + t = odp_time_local_from_ns(wait * 1000); + started = 1; + t1 = odp_time_sum(odp_time_local(), t); + } - /* Check every SLEEP_CHECK rounds if total wait time - * has been exceeded. */ - if ((++sleep_round & (SLEEP_CHECK - 1)) == 0) { - t2 = odp_time_local(); + /* Check every SLEEP_CHECK rounds if total wait time + * has been exceeded. */ + if ((++sleep_round & (SLEEP_CHECK - 1)) == 0) { + t2 = odp_time_local(); - if (odp_time_cmp(t2, t1) > 0) - return 0; - } - wait = wait > SLEEP_USEC ? wait - SLEEP_USEC : 0; + if (odp_time_cmp(t2, t1) > 0) + return 0; } + wait = wait > SLEEP_USEC ? wait - SLEEP_USEC : 0; nanosleep(&ts, NULL); } diff --git a/platform/linux-generic/pktio/pktio_common.c b/platform/linux-generic/pktio/pktio_common.c index f6fb4a73d..c7a1c3ab9 100644 --- a/platform/linux-generic/pktio/pktio_common.c +++ b/platform/linux-generic/pktio/pktio_common.c @@ -107,8 +107,7 @@ static int sock_recv_mq_tmo_select(pktio_entry_t * const *entry, timeout.tv_sec = usecs / (1000 * 1000); timeout.tv_usec = usecs - timeout.tv_sec * (1000ULL * 1000ULL); - if (select(maxfd + 1, readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, readfds, NULL, NULL, &timeout) == 0) return 0; for (i = 0; i < num_q; i++) { diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 147a06900..c198336a0 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -721,8 +721,7 @@ static int sock_recv_tmo(pktio_entry_t *pktio_entry, int index, FD_ZERO(&readfds); maxfd = sock_fd_set(pktio_entry, index, &readfds); - if (select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) return 0; return sock_mmsg_recv(pktio_entry, index, pkt_table, num); @@ -759,8 +758,7 @@ static int sock_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[], maxfd = maxfd2; } - if (select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) return 0; for (i = 0; i < num_q; i++) { diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 1bdb745a4..da83d8452 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -647,8 +647,7 @@ static int sock_mmap_recv_tmo(pktio_entry_t *pktio_entry, int index, FD_ZERO(&readfds); maxfd = sock_mmap_fd_set(pktio_entry, index, &readfds); - if (select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) return 0; return sock_mmap_recv(pktio_entry, index, pkt_table, num); @@ -685,8 +684,7 @@ static int sock_mmap_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[], timeout.tv_sec = usecs / (1000 * 1000); timeout.tv_usec = usecs - timeout.tv_sec * (1000ULL * 1000ULL); - if (select(maxfd + 1, &readfds, NULL, NULL, - usecs == ODP_PKTIN_WAIT ? NULL : &timeout) == 0) + if (select(maxfd + 1, &readfds, NULL, NULL, &timeout) == 0) return 0; for (i = 0; i < num_q; i++) { From patchwork Fri Jan 19 18:00:08 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: 125203 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp405057ljf; Fri, 19 Jan 2018 10:01:21 -0800 (PST) X-Google-Smtp-Source: ACJfBoufRQC/V9egiNGYZwdxhN/mTrpR0vwqMtEDDVaAPp1V+6wCDWuTl8YIljs35qkz/2DXUH3t X-Received: by 10.55.212.211 with SMTP id s80mr67409737qks.96.1516384880991; Fri, 19 Jan 2018 10:01:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516384880; cv=none; d=google.com; s=arc-20160816; b=zVgFaAO7ZyX5D0DfB1r0+WU7YT/s4RY26Yy3EulVUqztivdmYr+3HZNdeLiZYu/TF6 cTKMsK35s9CazIbNhkmtbZ1BpByjvmPVfQ45lS8LRwspjVScQDCvXw116O+sjNvxSlvW 1AR6IU+a4flZgBuCmHHWG8RkC5vV8lbxlm9rekQFBqqkx5wPhpNtQVdU+RrIbSJUQc83 CwAUqO6nFAIoFEF7VJ94Y8rjeLnxRR8u/CqpO89HCtta+IQFd3p/LGkrLVzVekCe/e1Q tBqDeGr5TMWLHTkHZnzdsd4yx8jLSrnyOa1aKpv2vEeydTrqUQTB2lBn7TDPSFUl6gnb m/ug== 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=pvxfebgkp4dtZzNP8MvyYP+VDqvxaWNVvZlVE0r0h2s=; b=AU8PRmECk2m8bY4tLUEY0gFgiTi6MF1nGEJaAfxUtNhLaYpbR9+2d/ImjzUc4newMY JhuiBwRnL5zeDh+/gJ8dS5tgBeRRoCZ8+Ang7O1JYjxx98uyCneiWQd9FFyPqGNfJz3D rJ4dRfpBBIFUqyxL7dBpixv+kxZdptmGvliztuzKIJ3ZhN1Z4jmyL1Dd5LZEfPbTGLpY Jx786QyMnj/kJXYn4qW8RN+q8FxNWJ3xH7cHglt3y6D1SZS7MXIk5plp+ireNFiPvXEC zPKdvoh/rCpNZPGMBXtJKFS8uv4WjLDAYMKcjj2RiFlCFogj38ruh/5cYZ0uA17A/Hgl VJdw== 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 f18si1388580qth.208.2018.01.19.10.01.20; Fri, 19 Jan 2018 10:01:20 -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 9E0AD60B52; Fri, 19 Jan 2018 18:01:20 +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 59FB66152C; Fri, 19 Jan 2018 18:00:25 +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 E632060887; Fri, 19 Jan 2018 18:00:14 +0000 (UTC) Received: from forward102o.mail.yandex.net (forward102o.mail.yandex.net [37.140.190.182]) by lists.linaro.org (Postfix) with ESMTPS id B0837608F9 for ; Fri, 19 Jan 2018 18:00:12 +0000 (UTC) Received: from mxback10g.mail.yandex.net (mxback10g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:171]) by forward102o.mail.yandex.net (Yandex) with ESMTP id B7D9A5A04EAF for ; Fri, 19 Jan 2018 21:00:11 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback10g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id eYQoBXJLuG-0BxaLwmM; Fri, 19 Jan 2018 21:00:11 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id C1ktYf9cEI-0BnaoGnU; Fri, 19 Jan 2018 21:00:11 +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:08 +0300 Message-Id: <1516384808-21464-4-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 3/3] api: pktio: drop support for indefinite waits on recv_tmo calls 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 The ODP_PKTIN_WAIT option on odp_pktin_recv_tmo() and odp_pktin_recv_mq_tmo() is deprecated and removed. 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 **/ include/odp/api/spec/packet_io.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index ad9b29fda..a55c2678f 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -72,11 +72,6 @@ extern "C" { * Do not wait on packet input */ -/** - * @def ODP_PKTIN_WAIT - * Wait infinitely on packet input - */ - /** * Packet input mode */ @@ -884,7 +879,6 @@ int odp_pktin_recv(odp_pktin_queue_t queue, odp_packet_t packets[], int num); * @param num Maximum number of packets to receive * @param wait Wait time specified as as follows: * * ODP_PKTIN_NO_WAIT: Do not wait - * * ODP_PKTIN_WAIT: Wait infinitely * * Other values specify the minimum time to wait. * Use odp_pktin_wait_time() to convert nanoseconds * to a valid parameter value. Wait time may be @@ -923,7 +917,6 @@ int odp_pktin_recv_tmo(odp_pktin_queue_t queue, odp_packet_t packets[], * @param num Maximum number of packets to receive * @param wait Wait time specified as as follows: * * ODP_PKTIN_NO_WAIT: Do not wait - * * ODP_PKTIN_WAIT: Wait infinitely * * Other values specify the minimum time to wait. * Use odp_pktin_wait_time() to convert nanoseconds * to a valid parameter value. Wait time may be