[v1,2/3] examples/multi_process: cleanup bus objects while terminating app

Message ID 20200728164252.2000-2-rohit.raj@nxp.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series [v1,1/3] eal: add API for bus close |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail Compilation issues

Commit Message

Rohit Raj July 28, 2020, 4:42 p.m. UTC
  From: Rohit Raj <rohit.raj@nxp.com>

Certain bus objects may need to be closed and re-acquired
while terminating and rerunning the client application.
Hence a signal handler is required to catch the termination
of the App and hence closing the bus objects.

This patch adds the missing signal handler in the client
app and closes the Bus objects in both client and server
applications when the signal Handler is called.

Signed-off-by: Rohit Raj <rohit.raj@nxp.com>
---
 .../multi_process/client_server_mp/mp_client/Makefile |  1 +
 .../multi_process/client_server_mp/mp_client/client.c | 11 +++++++++++
 .../multi_process/client_server_mp/mp_server/main.c   |  4 +++-
 3 files changed, 15 insertions(+), 1 deletion(-)
  

Comments

Sachin Saxena (OSS) Aug. 5, 2020, 9:28 a.m. UTC | #1
On 28-Jul-20 10:12 PM, rohit.raj@nxp.com wrote:
> From: Rohit Raj <rohit.raj@nxp.com>
>
> Certain bus objects may need to be closed and re-acquired
> while terminating and rerunning the client application.
> Hence a signal handler is required to catch the termination
> of the App and hence closing the bus objects.
>
> This patch adds the missing signal handler in the client
> app and closes the Bus objects in both client and server
> applications when the signal Handler is called.
>
> Signed-off-by: Rohit Raj <rohit.raj@nxp.com>
> ---
>   .../multi_process/client_server_mp/mp_client/Makefile |  1 +
>   .../multi_process/client_server_mp/mp_client/client.c | 11 +++++++++++
>   .../multi_process/client_server_mp/mp_server/main.c   |  4 +++-
>   3 files changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/examples/multi_process/client_server_mp/mp_client/Makefile b/examples/multi_process/client_server_mp/mp_client/Makefile
> index 7c447feba..9fdc74e61 100644
> --- a/examples/multi_process/client_server_mp/mp_client/Makefile
> +++ b/examples/multi_process/client_server_mp/mp_client/Makefile
> @@ -14,6 +14,7 @@ APP = mp_client
>   # all source are stored in SRCS-y
>   SRCS-y := client.c
>   
> +CFLAGS += -DALLOW_EXPERIMENTAL_API
Duplicate flag as it is already there in list (see below)
>   CFLAGS += $(WERROR_FLAGS) -O3
>   CFLAGS += -I$(SRCDIR)/../shared
>   CFLAGS += -DALLOW_EXPERIMENTAL_API
> diff --git a/examples/multi_process/client_server_mp/mp_client/client.c b/examples/multi_process/client_server_mp/mp_client/client.c
> index 361d90b54..a81be8849 100644
> --- a/examples/multi_process/client_server_mp/mp_client/client.c
> +++ b/examples/multi_process/client_server_mp/mp_client/client.c
> @@ -11,6 +11,7 @@
>   #include <stdlib.h>
>   #include <getopt.h>
>   #include <string.h>
> +#include <signal.h>
>   
>   #include <rte_common.h>
>   #include <rte_malloc.h>
> @@ -196,6 +197,14 @@ handle_packet(struct rte_mbuf *buf)
>   
>   }
>   
> +static void
> +signal_handler(int signal)
> +{
> +	if (signal == SIGINT)
> +		rte_bus_close();
- Since rte_bus_probe() is wrapped under rte_eal_init(), rte_bus_close() 
should also be handled in rte_eal_cleanup ( Also indicated by Stephen).
- We should call rte_eal_cleanup routine here.
- What about Normal exit path of main(), we should also handle this 
there too.

> +	exit(0);
> +}
> +
>   /*
>    * Application main function - loops through
>    * receiving and processing packets. Never returns
> @@ -217,6 +226,8 @@ main(int argc, char *argv[])
>   	argc -= retval;
>   	argv += retval;
>   
> +	signal(SIGINT, signal_handler);
> +
>   	if (parse_app_args(argc, argv) < 0)
>   		rte_exit(EXIT_FAILURE, "Invalid command-line arguments\n");
>   
> diff --git a/examples/multi_process/client_server_mp/mp_server/main.c b/examples/multi_process/client_server_mp/mp_server/main.c
> index 280dab867..a5ac84d85 100644
> --- a/examples/multi_process/client_server_mp/mp_server/main.c
> +++ b/examples/multi_process/client_server_mp/mp_server/main.c
> @@ -275,11 +275,13 @@ signal_handler(int signal)
>   {
>   	uint16_t port_id;
>   
> -	if (signal == SIGINT)
> +	if (signal == SIGINT) {
>   		RTE_ETH_FOREACH_DEV(port_id) {
>   			rte_eth_dev_stop(port_id);
>   			rte_eth_dev_close(port_id);
>   		}
> +		rte_bus_close();
> +	}
>   	exit(0);
>   }
>
  

Patch

diff --git a/examples/multi_process/client_server_mp/mp_client/Makefile b/examples/multi_process/client_server_mp/mp_client/Makefile
index 7c447feba..9fdc74e61 100644
--- a/examples/multi_process/client_server_mp/mp_client/Makefile
+++ b/examples/multi_process/client_server_mp/mp_client/Makefile
@@ -14,6 +14,7 @@  APP = mp_client
 # all source are stored in SRCS-y
 SRCS-y := client.c
 
+CFLAGS += -DALLOW_EXPERIMENTAL_API
 CFLAGS += $(WERROR_FLAGS) -O3
 CFLAGS += -I$(SRCDIR)/../shared
 CFLAGS += -DALLOW_EXPERIMENTAL_API
diff --git a/examples/multi_process/client_server_mp/mp_client/client.c b/examples/multi_process/client_server_mp/mp_client/client.c
index 361d90b54..a81be8849 100644
--- a/examples/multi_process/client_server_mp/mp_client/client.c
+++ b/examples/multi_process/client_server_mp/mp_client/client.c
@@ -11,6 +11,7 @@ 
 #include <stdlib.h>
 #include <getopt.h>
 #include <string.h>
+#include <signal.h>
 
 #include <rte_common.h>
 #include <rte_malloc.h>
@@ -196,6 +197,14 @@  handle_packet(struct rte_mbuf *buf)
 
 }
 
+static void
+signal_handler(int signal)
+{
+	if (signal == SIGINT)
+		rte_bus_close();
+	exit(0);
+}
+
 /*
  * Application main function - loops through
  * receiving and processing packets. Never returns
@@ -217,6 +226,8 @@  main(int argc, char *argv[])
 	argc -= retval;
 	argv += retval;
 
+	signal(SIGINT, signal_handler);
+
 	if (parse_app_args(argc, argv) < 0)
 		rte_exit(EXIT_FAILURE, "Invalid command-line arguments\n");
 
diff --git a/examples/multi_process/client_server_mp/mp_server/main.c b/examples/multi_process/client_server_mp/mp_server/main.c
index 280dab867..a5ac84d85 100644
--- a/examples/multi_process/client_server_mp/mp_server/main.c
+++ b/examples/multi_process/client_server_mp/mp_server/main.c
@@ -275,11 +275,13 @@  signal_handler(int signal)
 {
 	uint16_t port_id;
 
-	if (signal == SIGINT)
+	if (signal == SIGINT) {
 		RTE_ETH_FOREACH_DEV(port_id) {
 			rte_eth_dev_stop(port_id);
 			rte_eth_dev_close(port_id);
 		}
+		rte_bus_close();
+	}
 	exit(0);
 }