From: Stephen Hemminger <stephen@networkplumber.org> To: dev@dpdk.org Cc: Stephen Hemminger <stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v3 1/8] eal: log: close on cleanup Date: Tue, 28 Apr 2020 16:58:20 -0700 Message-ID: <20200428235827.15383-2-stephen@networkplumber.org> (raw) In-Reply-To: <20200428235827.15383-1-stephen@networkplumber.org> When application calls rte_eal_cleanup on shutdown, the DPDK log should be closed and cleaned up. Fixes: af75078fece3 ("first public release") Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- lib/librte_eal/common/eal_common_log.c | 12 ++++++++++++ lib/librte_eal/common/eal_private.h | 13 +++++++++++++ lib/librte_eal/linux/eal.c | 1 + lib/librte_eal/linux/eal_log.c | 14 ++++++++++++++ 4 files changed, 40 insertions(+) diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/librte_eal/common/eal_common_log.c index d7a5f9b6417a..43de798ae96a 100644 --- a/lib/librte_eal/common/eal_common_log.c +++ b/lib/librte_eal/common/eal_common_log.c @@ -479,3 +479,15 @@ eal_log_set_default(FILE *default_log) "Debug dataplane logs available - lower performance\n"); #endif } + +/* + * Called by environment-specific cleanup function. + */ +void +eal_log_cleanup(void) +{ + if (default_log_stream) { + fclose(default_log_stream); + default_log_stream = NULL; + } +} diff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h index ecf827914fdd..24ddfc6c53f4 100644 --- a/lib/librte_eal/common/eal_private.h +++ b/lib/librte_eal/common/eal_private.h @@ -89,6 +89,12 @@ int rte_eal_memzone_init(void); */ void eal_log_set_default(FILE *default_log); +/** + * Common log cleanup function (private to eal). + * Closes the default log stream. Called from rte_eal_cleanup(). + */ +void eal_log_cleanup(void); + /** * Fill configuration with number of physical and logical processors * @@ -150,6 +156,13 @@ int rte_eal_timer_init(void); */ int rte_eal_log_init(const char *id, int facility); +/** + * Close the default log stream + * + * This function is private to EAL. + */ +void rte_eal_log_cleanup(void); + /** * Save the log regexp for later */ diff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c index aa72d3650929..73d2c98b012b 100644 --- a/lib/librte_eal/linux/eal.c +++ b/lib/librte_eal/linux/eal.c @@ -1337,6 +1337,7 @@ rte_eal_cleanup(void) rte_trace_save(); eal_trace_fini(); eal_cleanup_config(&internal_config); + rte_eal_log_cleanup(); return 0; } diff --git a/lib/librte_eal/linux/eal_log.c b/lib/librte_eal/linux/eal_log.c index 43c8460bfb07..258a16ff2498 100644 --- a/lib/librte_eal/linux/eal_log.c +++ b/lib/librte_eal/linux/eal_log.c @@ -37,8 +37,16 @@ console_log_write(__rte_unused void *c, const char *buf, size_t size) return ret; } +static int +console_log_close(__rte_unused void *c) +{ + closelog(); + return 0; +} + static cookie_io_functions_t console_log_func = { .write = console_log_write, + .close = console_log_close, }; /* @@ -60,3 +68,9 @@ rte_eal_log_init(const char *id, int facility) return 0; } + +void +rte_eal_log_cleanup(void) +{ + eal_log_cleanup(); +} -- 2.20.1
next prev parent reply other threads:[~2020-04-28 23:58 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-04 1:33 [dpdk-dev] [PATCH 00/14] cleanup resources on shutdown Stephen Hemminger 2020-01-04 1:33 ` [dpdk-dev] [PATCH 01/14] eal: log: close on cleanup Stephen Hemminger 2020-01-04 1:33 ` [dpdk-dev] [PATCH 02/14] eal: log: free dynamic state " Stephen Hemminger 2020-04-25 16:26 ` David Marchand 2020-01-04 1:33 ` [dpdk-dev] [PATCH 03/14] eal: alarm: close timerfd on eal cleanup Stephen Hemminger 2020-04-25 16:32 ` David Marchand 2020-01-04 1:33 ` [dpdk-dev] [PATCH 04/14] eal: cleanup threads Stephen Hemminger 2020-02-04 14:48 ` Aaron Conole 2020-01-04 1:33 ` [dpdk-dev] [PATCH 05/14] eal: intr: cleanup resources Stephen Hemminger 2020-04-25 16:49 ` David Marchand 2020-04-26 16:24 ` Stephen Hemminger 2020-01-04 1:33 ` [dpdk-dev] [PATCH 06/14] eal: mp: end the multiprocess thread during cleanup Stephen Hemminger 2020-04-27 15:37 ` Burakov, Anatoly 2020-01-04 1:33 ` [dpdk-dev] [PATCH 07/14] eal: interrupts close epoll fd on shutdown Stephen Hemminger 2020-01-04 1:33 ` [dpdk-dev] [PATCH 08/14] eal: vfio: cleanup the mp sync handle Stephen Hemminger 2020-04-27 12:12 ` Burakov, Anatoly 2020-01-04 1:33 ` [dpdk-dev] [PATCH 09/14] eal: close mem config on cleanup Stephen Hemminger 2020-04-27 12:12 ` Burakov, Anatoly 2020-04-27 17:00 ` Stephen Hemminger 2020-04-28 9:20 ` Burakov, Anatoly 2020-01-04 1:33 ` [dpdk-dev] [PATCH 10/14] tap: close netlink socket on device close Stephen Hemminger 2020-04-25 15:52 ` David Marchand 2020-01-04 1:33 ` [dpdk-dev] [PATCH 11/14] eal: cleanup plugins data Stephen Hemminger 2020-01-04 1:33 ` [dpdk-dev] [PATCH 12/14] ethdev: raise priority of old driver warning Stephen Hemminger 2020-04-25 15:53 ` Thomas Monjalon 2020-01-04 1:33 ` [dpdk-dev] [PATCH 13/14] eal: hotplug: cleanup multiprocess resources Stephen Hemminger 2020-01-04 1:33 ` [dpdk-dev] [PATCH 14/14] eal: malloc: cleanup mp resources Stephen Hemminger 2020-04-27 12:10 ` Burakov, Anatoly 2020-02-05 9:32 ` [dpdk-dev] [PATCH 00/14] cleanup resources on shutdown David Marchand 2020-02-05 12:07 ` Stephen Hemminger 2020-02-05 12:32 ` David Marchand 2020-02-06 14:06 ` David Marchand 2020-02-07 18:24 ` Stephen Hemminger 2020-04-25 19:34 ` David Marchand 2020-04-28 23:14 ` [dpdk-dev] [PATCH v2 0/9] eal: " Stephen Hemminger 2020-04-28 23:14 ` [dpdk-dev] [PATCH v2 1/8] eal: log: close on cleanup Stephen Hemminger 2020-04-28 23:14 ` [dpdk-dev] [PATCH v2 2/8] eal: log: free dynamic state " Stephen Hemminger 2020-04-28 23:14 ` [dpdk-dev] [PATCH v2 3/8] eal: alarm: close file " Stephen Hemminger 2020-04-28 23:14 ` [dpdk-dev] [PATCH v2 4/8] eal: cleanup threads Stephen Hemminger 2020-04-28 23:14 ` [dpdk-dev] [PATCH v2 5/8] eal: mp: end the multiprocess thread during cleanup Stephen Hemminger 2020-04-28 23:14 ` [dpdk-dev] [PATCH v2 6/8] eal: vfio: cleanup the mp sync handle Stephen Hemminger 2020-04-28 23:14 ` [dpdk-dev] [PATCH v2 7/8] eal: hotplug: cleanup multiprocess resources Stephen Hemminger 2020-04-28 23:14 ` [dpdk-dev] [PATCH v2 8/8] eal: malloc: cleanup mp resources Stephen Hemminger 2020-04-28 23:58 ` [dpdk-dev] [PATCH v3 0/8] eal: cleanup resources on shutdown Stephen Hemminger 2020-04-28 23:58 ` Stephen Hemminger [this message] 2020-04-28 23:58 ` [dpdk-dev] [PATCH v3 2/8] eal: log: free dynamic state on cleanup Stephen Hemminger 2020-04-28 23:58 ` [dpdk-dev] [PATCH v3 3/8] eal: alarm: close file " Stephen Hemminger 2020-04-28 23:58 ` [dpdk-dev] [PATCH v3 4/8] eal: cleanup threads Stephen Hemminger 2020-04-28 23:58 ` [dpdk-dev] [PATCH v3 5/8] eal: mp: end the multiprocess thread during cleanup Stephen Hemminger 2020-04-28 23:58 ` [dpdk-dev] [PATCH v3 6/8] eal: vfio: cleanup the mp sync handle Stephen Hemminger 2020-04-28 23:58 ` [dpdk-dev] [PATCH v3 7/8] eal: hotplug: cleanup multiprocess resources Stephen Hemminger 2020-04-28 23:58 ` [dpdk-dev] [PATCH v3 8/8] eal: malloc: cleanup mp resources Stephen Hemminger 2020-05-03 17:21 ` [dpdk-dev] [PATCH v3 0/8] eal: cleanup resources on shutdown David Marchand 2020-10-19 22:24 ` Thomas Monjalon 2021-03-24 21:30 ` Thomas Monjalon 2021-11-13 0:28 ` [PATCH v4 0/5] cleanup more stuff " Stephen Hemminger 2021-11-13 0:28 ` [PATCH v4 1/5] eal: close log in eal_cleanup Stephen Hemminger 2021-11-13 0:28 ` [PATCH v4 2/5] eal: mp: end the multiprocess thread during cleanup Stephen Hemminger 2021-11-13 0:28 ` [PATCH v4 3/5] eal: vfio: cleanup the mp sync handle Stephen Hemminger 2021-11-13 0:28 ` [PATCH v4 4/5] eal: hotplug: cleanup multiprocess resources Stephen Hemminger 2021-11-13 0:28 ` [PATCH v4 5/5] eal: malloc: cleanup mp resources Stephen Hemminger 2021-11-13 3:32 ` [PATCH v5 0/5] cleanup DPDK resources via eal_cleanup Stephen Hemminger 2021-11-13 3:32 ` [PATCH v5 1/5] eal: close log in eal_cleanup Stephen Hemminger 2021-11-13 3:32 ` [PATCH v5 2/5] eal: mp: end the multiprocess thread during cleanup Stephen Hemminger 2021-11-13 3:32 ` [PATCH v5 3/5] eal: vfio: cleanup the mp sync handle Stephen Hemminger 2021-11-13 3:32 ` [PATCH v5 4/5] eal: hotplug: cleanup multiprocess resources Stephen Hemminger 2021-11-13 3:32 ` [PATCH v5 5/5] eal: malloc: cleanup mp resources Stephen Hemminger 2021-11-13 17:22 ` [PATCH v6 0/5] cleanup more resources on eal_cleanup Stephen Hemminger 2021-11-13 17:22 ` [PATCH v6 1/5] eal: close log in eal_cleanup Stephen Hemminger 2021-11-13 17:22 ` [PATCH v6 2/5] eal: mp: end the multiprocess thread during cleanup Stephen Hemminger 2021-11-13 17:22 ` [PATCH v6 3/5] eal: vfio: cleanup the mp sync handle Stephen Hemminger 2021-11-13 17:22 ` [PATCH v6 4/5] eal: hotplug: cleanup multiprocess resources Stephen Hemminger 2021-11-13 17:22 ` [PATCH v6 5/5] eal: malloc: cleanup mp resources Stephen Hemminger 2022-02-11 20:17 ` [PATCH v6 0/5] cleanup more resources on eal_cleanup Thomas Monjalon
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200428235827.15383-2-stephen@networkplumber.org \ --to=stephen@networkplumber.org \ --cc=dev@dpdk.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git