From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E951AA0093; Mon, 15 Jun 2020 10:44:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C9E8E4F9C; Mon, 15 Jun 2020 10:44:42 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 3D27749E0 for ; Mon, 15 Jun 2020 10:44:42 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id u26so13572994wmn.1 for ; Mon, 15 Jun 2020 01:44:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emumba-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZLMAJiHpQtugHKODH9IswC8E0vE/qCqGaf29TJYSfNg=; b=FsfJxoyD3IVMq0Q9tg11ObT9DHtR3CCD2avoQmaaDZXws5JlmFRgaL00uQYFxTDdf9 NJwFAtbvjeAjxKbP3UKaWKbdMlhwp9G4MrJdtSTp3wOFLl3miAKsQAhCkEnrHDZpMZjH yT9udgI9Wt9DA4D22NetpB+rSd5Tvnt4Ov73UXGusjAze9S2/nfIpzqR+otsU3VvfRuV BwNi9YY/4xPzcSuo0RXw23Afjq8O3bRQafCfW9WTh/uEwbtoSH15GtPZybwl0Ppibo7Q Aa9jJ/AD4rLxrZQJKQMe2V0r10H5UVqsMWiu6DUjrLvuxL7Jz5mMZPGUI0HtBzGDiKBP 3BMQ== 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=ZLMAJiHpQtugHKODH9IswC8E0vE/qCqGaf29TJYSfNg=; b=CpMT4Lhl2mVh4b5MEm1XWW46vuQ05kagdsjbWJvvdkls6jZZo11/MXU5A5jT3JJ/ji jCOtaQUZBOaaEck+ymqOEXzo6Ci8VuI2IBU98pRyHw9U3r5EhdKNsTQh5nDFZ5o/4jbv sInjeY9STmgjwe2qBGRhsa416on9ZVtJoiK4LtKSO3QjZdaABwCzp0svV3JKxhzamWVz f/FxmGnGpXDU1Dh02dDJtIUIyNlFzgAMjeJoSfkr4Rv/CA96I5ec3xhDY3A8l7I9lIJ2 TZLFGt5UCTMkHQhYxy8vhhmtNHNO8CyhKsA8CGE4a+dMIh/wkzLoKlwpvjBRTZ/TTzxw M17w== X-Gm-Message-State: AOAM530xvwAZlCtamkX1+XSh/NQHE4ebhNhZj4cQMlIdStrUNel13Dz3 Hm4IJPep0GaEuQzADnTzveuiXYVNy2Iaieds X-Google-Smtp-Source: ABdhPJz3afn6jCv3iK0j04VHgr8mRPecnUXSqdrah339miHEdoQoiVL/6Bo2yxPwIW2d0x5i+3Dp2Q== X-Received: by 2002:a1c:1f4d:: with SMTP id f74mr11156228wmf.12.1592210681629; Mon, 15 Jun 2020 01:44:41 -0700 (PDT) Received: from localhost.localdomain ([39.40.31.151]) by smtp.gmail.com with ESMTPSA id 67sm24266075wrk.49.2020.06.15.01.44.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 01:44:41 -0700 (PDT) From: Sarosh Arif To: dev@dpdk.org, bruce.richardson@intel.com, john.mcnamara@intel.com, reshma.pattan@intel.com, vipin.varghese@intel.com Cc: stable@dpdk.org, Sarosh Arif Date: Mon, 15 Jun 2020 13:41:31 +0500 Message-Id: <20200615084132.9553-2-sarosh.arif@emumba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200615084132.9553-1-sarosh.arif@emumba.com> References: <20200615084132.9553-1-sarosh.arif@emumba.com> Subject: [dpdk-dev] [PATCH 2/3] examples/rxtx_callbacks: free resources on exit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Resources should be cleared while exiting the application. Bugzilla ID: 437 Signed-off-by: Sarosh Arif --- examples/rxtx_callbacks/main.c | 45 ++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/examples/rxtx_callbacks/main.c b/examples/rxtx_callbacks/main.c index 54d124b00..bc594dd20 100644 --- a/examples/rxtx_callbacks/main.c +++ b/examples/rxtx_callbacks/main.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2010-2015 Intel Corporation */ - +#include #include #include #include @@ -34,6 +34,7 @@ static struct { } latency_numbers; int hw_timestamping; +static volatile bool quit_signal; #define TICKS_PER_CYCLE_SHIFT 16 static uint64_t ticks_per_cycle_mult; @@ -215,7 +216,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool) * Main thread that does the work, reading from INPUT_PORT * and writing to OUTPUT_PORT */ -static __rte_noreturn void +static void lcore_main(void) { uint16_t port; @@ -230,7 +231,7 @@ lcore_main(void) printf("\nCore %u forwarding packets. [Ctrl+C to quit]\n", rte_lcore_id()); - for (;;) { + while (!quit_signal) { RTE_ETH_FOREACH_DEV(port) { struct rte_mbuf *bufs[BURST_SIZE]; const uint16_t nb_rx = rte_eth_rx_burst(port, 0, @@ -249,6 +250,24 @@ lcore_main(void) } } +static void +stop_and_close_eth_dev(uint16_t port_id) +{ + RTE_ETH_FOREACH_DEV(port_id) { + printf("Closing port %d...", port_id); + rte_eth_dev_stop(port_id); + rte_eth_dev_close(port_id); + printf(" Done\n"); + } +} + +static void +int_handler(int sig_num) +{ + printf("Exiting on signal %d\n", sig_num); + quit_signal = true; +} + /* Main function, does initialisation and calls the per-lcore functions */ int main(int argc, char *argv[]) @@ -260,7 +279,9 @@ main(int argc, char *argv[]) { NULL, 0, 0, 0 } }; int opt, option_index; - + quit_signal = false; + /* catch ctrl-c so we can clear resources on exit */ + signal(SIGINT, int_handler); /* init EAL */ int ret = rte_eal_init(argc, argv); @@ -278,25 +299,33 @@ main(int argc, char *argv[]) break; default: printf(usage, argv[0]); + stop_and_close_eth_dev(portid); + rte_eal_cleanup(); return -1; } optind = 1; /* reset getopt lib */ nb_ports = rte_eth_dev_count_avail(); - if (nb_ports < 2 || (nb_ports & 1)) + if (nb_ports < 2 || (nb_ports & 1)) { + stop_and_close_eth_dev(portid); rte_exit(EXIT_FAILURE, "Error: number of ports must be even\n"); + } mbuf_pool = rte_pktmbuf_pool_create("MBUF_POOL", NUM_MBUFS * nb_ports, MBUF_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id()); - if (mbuf_pool == NULL) + if (mbuf_pool == NULL) { + stop_and_close_eth_dev(portid); rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n"); + } /* initialize all ports */ RTE_ETH_FOREACH_DEV(portid) - if (port_init(portid, mbuf_pool) != 0) + if (port_init(portid, mbuf_pool) != 0) { + stop_and_close_eth_dev(portid); rte_exit(EXIT_FAILURE, "Cannot init port %"PRIu8"\n", portid); + } if (rte_lcore_count() > 1) printf("\nWARNING: Too much enabled lcores - " @@ -304,5 +333,7 @@ main(int argc, char *argv[]) /* call lcore_main on master core only */ lcore_main(); + stop_and_close_eth_dev(portid); + rte_eal_cleanup(); return 0; } -- 2.17.1