public inbox for newlib-cvs@sourceware.org help / color / mirror / Atom feed
From: Sebastian Huber <sh@sourceware.org> To: cygwin-cvs@sourceware.org, newlib-cvs@sourceware.org Subject: [newlib-cygwin] Add stdio_exit_handler() Date: Fri, 13 May 2022 11:20:02 +0000 (GMT) [thread overview] Message-ID: <20220513112002.2E4F53839C62@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=26747c47bc0a1137e02e0377306d721cc3478855 commit 26747c47bc0a1137e02e0377306d721cc3478855 Author: Matt Joyce <matthew.joyce@embedded-brains.de> Date: Tue May 3 06:51:22 2022 +0200 Add stdio_exit_handler() Add a dedicated stdio exit handler to avoid using _GLOBAL_REENT in exit(). Diff: --- 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 8175de07b..0530355d7 100644 --- a/winsup/cygwin/signal.cc +++ b/winsup/cygwin/signal.cc @@ -14,6 +14,7 @@ details. */ #include <unistd.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" @@ -409,8 +410,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) + (*__stdio_exit_handler) (); do_exit (SIGABRT); /* signal handler didn't exit. Goodbye. */ }
reply other threads:[~2022-05-13 11:20 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20220513112002.2E4F53839C62@sourceware.org \ --to=sh@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ --cc=newlib-cvs@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: linkBe 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).