From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id 2E4F53839C62; Fri, 13 May 2022 11:20:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2E4F53839C62 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Sebastian Huber To: cygwin-cvs@sourceware.org, newlib-cvs@sourceware.org Subject: [newlib-cygwin] Add stdio_exit_handler() X-Act-Checkin: newlib-cygwin X-Git-Author: Matt Joyce X-Git-Refname: refs/heads/master X-Git-Oldrev: 4b28f3c125c4a4a17d5084548393962778ab27b2 X-Git-Newrev: 26747c47bc0a1137e02e0377306d721cc3478855 Message-Id: <20220513112002.2E4F53839C62@sourceware.org> Date: Fri, 13 May 2022 11:20:02 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2022 11:20:02 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D26747c47bc0= a1137e02e0377306d721cc3478855 commit 26747c47bc0a1137e02e0377306d721cc3478855 Author: Matt Joyce Date: Tue May 3 06:51:22 2022 +0200 Add stdio_exit_handler() =20 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/reen= t.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_PT= R__; =20 extern struct _reent _impure_data __ATTRIBUTE_IMPURE_DATA__; =20 +extern void (*__stdio_exit_handler) (void); + void _reclaim_reent (struct _reent *); =20 /* #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 #include "local.h" =20 +void (*__stdio_exit_handler) (void); + #if defined(_REENT_SMALL) && !defined(_REENT_GLOBAL_STDIO_STREAMS) const struct __sFILE_fake __sf_fake_stdin =3D {_NULL, 0, 0, 0, 0, {_NULL, 0}, 0, _NULL}; @@ -153,6 +155,12 @@ sfmoreglue (struct _reent *d, int n) return &g->glue; } =20 +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) =20 _newlib_sfp_lock_start (); =20 - if (_GLOBAL_REENT->__cleanup =3D=3D NULL) { + if (__stdio_exit_handler =3D=3D NULL) { #ifdef _REENT_GLOBAL_STDIO_STREAMS _GLOBAL_REENT->__sglue._niobs =3D 3; _GLOBAL_REENT->__sglue._iobs =3D &__sf[0]; #endif __sinit (_GLOBAL_REENT); + __stdio_exit_handler =3D stdio_exit_handler; } =20 for (g =3D &_GLOBAL_REENT->__sglue;; g =3D 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); =20 - if (_GLOBAL_REENT->__cleanup) - (*_GLOBAL_REENT->__cleanup) (_GLOBAL_REENT); + if (__stdio_exit_handler !=3D 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 #include #include +#include /* 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 */ =20 /* 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. */ }