From: Matthew Joyce <matthew.joyce@embedded-brains.de>
To: newlib@sourceware.org
Subject: [PATCH v2 08/11] Add stdio_exit_handler()
Date: Thu, 12 May 2022 14:11:40 +0200 [thread overview]
Message-ID: <20220512121143.21473-9-matthew.joyce@embedded-brains.de> (raw)
In-Reply-To: <20220512121143.21473-1-matthew.joyce@embedded-brains.de>
From: Matt Joyce <matthew.joyce@embedded-brains.de>
Added a dedicated stdio exit handler to avoid using _GLOBAL_REENT
in exit().
---
newlib/libc/include/sys/reent.h | 2 ++
newlib/libc/stdio/findfp.c | 11 ++++++++++-
newlib/libc/stdlib/exit.c | 5 +++--
winsup/cygwin/signal.cc | 5 +++--
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index 4b0d68610..067294dc7 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -837,6 +837,8 @@ extern struct _reent *_impure_ptr __ATTRIBUTE_IMPURE_PTR__;
extern struct _reent _impure_data __ATTRIBUTE_IMPURE_DATA__;
+extern void (*__stdio_exit_handler) (void);
+
void _reclaim_reent (struct _reent *);
/* #define _REENT_ONLY define this to get only reentrant routines */
diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
index 5b0402ac1..719886e27 100644
--- a/newlib/libc/stdio/findfp.c
+++ b/newlib/libc/stdio/findfp.c
@@ -26,6 +26,8 @@
#include <sys/lock.h>
#include "local.h"
+void (*__stdio_exit_handler) (void);
+
#if defined(_REENT_SMALL) && !defined(_REENT_GLOBAL_STDIO_STREAMS)
const struct __sFILE_fake __sf_fake_stdin =
{_NULL, 0, 0, 0, 0, {_NULL, 0}, 0, _NULL};
@@ -153,6 +155,12 @@ sfmoreglue (struct _reent *d, int n)
return &g->glue;
}
+static void
+stdio_exit_handler (void)
+{
+ (void) _fwalk_reent (_GLOBAL_REENT, CLEANUP_FILE);
+}
+
/*
* Find a free FILE for fopen et al.
*/
@@ -166,12 +174,13 @@ __sfp (struct _reent *d)
_newlib_sfp_lock_start ();
- if (_GLOBAL_REENT->__cleanup == NULL) {
+ if (__stdio_exit_handler == NULL) {
#ifdef _REENT_GLOBAL_STDIO_STREAMS
_GLOBAL_REENT->__sglue._niobs = 3;
_GLOBAL_REENT->__sglue._iobs = &__sf[0];
#endif
__sinit (_GLOBAL_REENT);
+ __stdio_exit_handler = stdio_exit_handler;
}
for (g = &_GLOBAL_REENT->__sglue;; g = g->_next)
diff --git a/newlib/libc/stdlib/exit.c b/newlib/libc/stdlib/exit.c
index 3e618914e..9b7bd518b 100644
--- a/newlib/libc/stdlib/exit.c
+++ b/newlib/libc/stdlib/exit.c
@@ -59,7 +59,8 @@ exit (int code)
#endif
__call_exitprocs (code, NULL);
- if (_GLOBAL_REENT->__cleanup)
- (*_GLOBAL_REENT->__cleanup) (_GLOBAL_REENT);
+ if (__stdio_exit_handler != NULL)
+ (*__stdio_exit_handler) ();
+
_exit (code);
}
diff --git a/winsup/cygwin/signal.cc b/winsup/cygwin/signal.cc
index 9b6c2509d..f5f2efdc7 100644
--- a/winsup/cygwin/signal.cc
+++ b/winsup/cygwin/signal.cc
@@ -13,6 +13,7 @@ details. */
#include <stdlib.h>
#include <sys/cygwin.h>
#include <sys/signalfd.h>
+#include <sys/reent.h> /* needed for __stdio_exit_handler declaration */
#include "pinfo.h"
#include "sigproc.h"
#include "cygtls.h"
@@ -408,8 +409,8 @@ abort (void)
_my_tls.call_signal_handler (); /* Call any signal handler */
/* Flush all streams as per SUSv2. */
- if (_GLOBAL_REENT->__cleanup)
- _GLOBAL_REENT->__cleanup (_GLOBAL_REENT);
+ if (__stdio_exit_handler != NULL)
+ (*__stdio_exit_handler) ();
do_exit (SIGABRT); /* signal handler didn't exit. Goodbye. */
}
--
2.31.1
next prev parent reply other threads:[~2022-05-12 12:11 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-12 12:11 [PATCH v2 00/11] Decouple global file object list from _GLOBAL_REENT Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 01/11] Remove duplicate stdio initializations Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 02/11] Remove duplicate sglue initializations Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 03/11] Declare global __sf[] only once Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 04/11] Add two __sglue initialization macros Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 05/11] Remove __sinit_locks / __sinit_recursive_mutex Matthew Joyce
2022-05-12 13:25 ` Torbjorn SVENSSON
2022-05-12 13:51 ` Sebastian Huber
2022-05-12 12:11 ` [PATCH v2 06/11] Move __sglue initializations to __sfp() Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 07/11] Add CLEANUP_FILE define Matthew Joyce
2022-05-12 12:11 ` Matthew Joyce [this message]
2022-05-12 19:11 ` [PATCH v2 08/11] Add stdio_exit_handler() Corinna Vinschen
2022-05-17 8:36 ` Takashi Yano
2022-05-17 10:13 ` Sebastian Huber
2022-05-12 12:11 ` [PATCH v2 09/11] stdio: Replace _fwalk_reent() with _fwalk_sglue() Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 10/11] Add global __sglue object for all configurations Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 11/11] Remove __sglue member for one configuration Matthew Joyce
2022-05-12 19:09 ` Corinna Vinschen
2022-05-12 19:14 ` [PATCH v2 00/11] Decouple global file object list from _GLOBAL_REENT Corinna Vinschen
2022-05-12 19:44 ` Corinna Vinschen
2022-05-13 5:44 ` Sebastian Huber
2022-05-13 7:53 ` Corinna Vinschen
2022-05-13 10:54 ` Sebastian Huber
2022-05-13 11:20 ` Corinna Vinschen
2022-05-13 8:03 ` Corinna Vinschen
2022-05-13 11:20 ` Sebastian Huber
2022-05-13 11:30 ` Corinna Vinschen
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=20220512121143.21473-9-matthew.joyce@embedded-brains.de \
--to=matthew.joyce@embedded-brains.de \
--cc=newlib@sourceware.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).