From patchwork Fri Dec 23 15:19:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 88957 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp3372573qgi; Fri, 23 Dec 2016 07:20:29 -0800 (PST) X-Received: by 10.55.55.143 with SMTP id e137mr14703751qka.237.1482506429553; Fri, 23 Dec 2016 07:20:29 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id n186si10425117qkd.140.2016.12.23.07.20.29; Fri, 23 Dec 2016 07:20:29 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 3558060C17; Fri, 23 Dec 2016 15:20:29 +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=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED 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 05AC760BFF; Fri, 23 Dec 2016 15:20:07 +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 72B7360BFF; Fri, 23 Dec 2016 15:20:01 +0000 (UTC) Received: from mail-lf0-f45.google.com (mail-lf0-f45.google.com [209.85.215.45]) by lists.linaro.org (Postfix) with ESMTPS id E71D16083E for ; Fri, 23 Dec 2016 15:19:59 +0000 (UTC) Received: by mail-lf0-f45.google.com with SMTP id t196so140051510lff.3 for ; Fri, 23 Dec 2016 07:19:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ufEOzYiTkDiGRxoiKz0VDNEjOQJJYBhUSKozjY6Q4VI=; b=JvJKYxmeoizlJDvPCxDwU27/Anp2vJWlGnus8xq0E7xUbO90YIDQJ3Qo1q7/SxbRkg BMdFcaYhAYcmbNsBINp23S+dby1XdP8xT6zlvhWODqnZ7mXv94Kbd6R6F9dQC9FCYRDc yP9Gky6AVO/D0eHMReUplqyc/ppD3m1ZW7k6Mqxfgb6UN6y+eOD7EHhdhg48z0/0mQUq ld9zXJbiSCisNju/9G71RkXz/01yOYada+BIQFnNkBVFUrjiRRPcmHvV/fGPUtJuBjec /HGGFMySy+nm3V0W7bAckzJkkTytb2cJKPb3XK8Dkquk5Ny5U2ENi99sVwOYc4eefQUc ehzw== X-Gm-Message-State: AIkVDXKJ+6mx3sfDrBUC50CpieJs8exOGtAYXvaMwPapIb90audzLmkb4ADM+ZvOj1Ko0RYny4s= X-Received: by 10.25.199.198 with SMTP id x189mr6172981lff.164.1482506398434; Fri, 23 Dec 2016 07:19:58 -0800 (PST) Received: from localhost.localdomain (ppp91-77-165-188.pppoe.mtu-net.ru. [91.77.165.188]) by smtp.gmail.com with ESMTPSA id l135sm7821420lfe.10.2016.12.23.07.19.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Dec 2016 07:19:57 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 23 Dec 2016 18:19:50 +0300 Message-Id: <1482506391-12106-2-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.7.1.250.gff4ea60 In-Reply-To: <1482506391-12106-1-git-send-email-maxim.uvarov@linaro.org> References: <1482506391-12106-1-git-send-email-maxim.uvarov@linaro.org> Subject: [lng-odp] [PATCH 1/2] test: linux-gen: vlan insertion: add time-out exit 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" signal can be ignored and app will not exit cleanly, add time-out on recv to exit after that time. Signed-off-by: Maxim Uvarov --- test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c | 22 +++++++++------------- test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.sh | 15 ++++----------- 2 files changed, 13 insertions(+), 24 deletions(-) -- 2.7.1.250.gff4ea60 diff --git a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c b/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c index b91eb53..863d1fb 100644 --- a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c +++ b/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c @@ -19,7 +19,6 @@ #define MAX_PKT_BURST 32 #define MAX_WORKERS 1 -static volatile int exit_thr; static int g_ret; struct { @@ -29,12 +28,6 @@ struct { odph_ethaddr_t src, dst; } global; -static void sig_handler(int signo ODP_UNUSED) -{ - printf("sig_handler!\n"); - exit_thr = 1; -} - static odp_pktio_t create_pktio(const char *name, odp_pool_t pool, odp_pktin_queue_t *pktin, odp_pktout_queue_t *pktout) @@ -85,6 +78,7 @@ static int run_worker(void *arg ODP_UNUSED) odp_packet_t pkt_tbl[MAX_PKT_BURST]; int pkts, sent, tx_drops, i; int total_pkts = 0; + uint64_t wait_time = odp_pktin_wait_time(2 * ODP_TIME_SEC_IN_NS); if (odp_pktio_start(global.if0)) { printf("unable to start input interface\n"); @@ -98,12 +92,14 @@ static int run_worker(void *arg ODP_UNUSED) printf("started output interface\n"); printf("started all\n"); - while (!exit_thr) { + while (1) { pkts = odp_pktin_recv_tmo(global.if0in, pkt_tbl, MAX_PKT_BURST, - ODP_PKTIN_NO_WAIT); + wait_time); + if (odp_unlikely(pkts <= 0)) { + printf("recv tmo!\n"); + break; + } - if (odp_unlikely(pkts <= 0)) - continue; for (i = 0; i < pkts; i++) { odp_packet_t pkt = pkt_tbl[i]; odph_ethhdr_t *eth; @@ -125,6 +121,8 @@ static int run_worker(void *arg ODP_UNUSED) odp_packet_free_multi(&pkt_tbl[sent], tx_drops); } + printf("Total send packets: %d\n", total_pkts); + if (total_pkts < 10) g_ret = -1; @@ -208,8 +206,6 @@ int main(int argc, char **argv) thr_params.thr_type = ODP_THREAD_WORKER; thr_params.instance = instance; - signal(SIGINT, sig_handler); - odph_odpthreads_create(thd, &cpumask, &thr_params); odph_odpthreads_join(thd); diff --git a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.sh b/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.sh index 0aa5e3f..3c6df8e 100755 --- a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.sh +++ b/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.sh @@ -11,6 +11,7 @@ # linux-generic packet mmap pktio. # # +export ODP_PKTIO_DISABLE_SOCKET_MMSG=1 # directory where platform test sources are, including scripts TEST_SRC_DIR=$(dirname $0) @@ -64,19 +65,11 @@ PCAP_OUT=vlan_out.pcap # Listen on veth pipe and write to pcap Send pcap plat_mmap_vlan_ins${EXEEXT} pktiop0p1 pcap:out=${PCAP_OUT} \ 00:02:03:04:05:06 00:08:09:0a:0b:0c & -P1=$! # Send pcap file to veth interface -plat_mmap_vlan_ins${EXEEXT} pcap:in=${PCAP_IN} pktiop0p1 \ - 01:02:03:04:05:06 01:08:09:0a:0b:0c & -P2=$! +plat_mmap_vlan_ins${EXEEXT} pcap:in=${PCAP_IN} pktiop1p0 \ + 01:02:03:04:05:06 01:08:09:0a:0b:0c -sleep 1 -kill -s INT ${P1} -kill -s INT ${P2} - -ret=$? rm -f ${PCAP_OUT} - cleanup_pktio_env -exit $ret +exit 0