From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from conssluserg-03.nifty.com (conssluserg-03.nifty.com [210.131.2.82]) by sourceware.org (Postfix) with ESMTPS id D96B73858010 for ; Tue, 17 May 2022 08:37:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D96B73858010 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=nifty.ne.jp Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=nifty.ne.jp Received: from Express5800-S70 (ak044095.dynamic.ppp.asahi-net.or.jp [119.150.44.95]) (authenticated) by conssluserg-03.nifty.com with ESMTP id 24H8acYP004662; Tue, 17 May 2022 17:36:38 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-03.nifty.com 24H8acYP004662 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.ne.jp; s=dec2015msa; t=1652776599; bh=wzouVUX5O1Zn/uIRSVc5f+tk30Tar5PaLyP8fFusb5U=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=hN5T4dyL6HhKd/W+FgaFWUh+4vArUZKy7Rky/+lfSsBeD1UWYwkAcg45Ke7/Ck9V4 IvBaDObhBAyx7NuRFptlZhQ+wEB4ahHlEmCw8kmH31rqwCPxWx5jaqrdtkSYuRNh8p vLO7IfaBt5CFe/ZMfPTn8ghq4SsEz1ZX5ONUUbB+VTXNRkIeBe0ZyN425YNBgrpsGJ 9fNklcAF1UDbJ+3alyIwyaCekXgJjfHaYaUwiYzc4OlkqfGUxmYwJg3f9Lp9eTWtdU H4jNVGdfaacq+LQ7oeTyz8H7jOfZ0Y5KZ+sQ4PX2r+tqPXq184xz/oTcQE/QuYGTaO 3+be1z2KRXZdw== X-Nifty-SrcIP: [119.150.44.95] Date: Tue, 17 May 2022 17:36:51 +0900 From: Takashi Yano To: newlib@sourceware.org Subject: Re: [PATCH v2 08/11] Add stdio_exit_handler() Message-Id: <20220517173651.e40369e3e02925df1d0c8e32@nifty.ne.jp> In-Reply-To: <20220512121143.21473-9-matthew.joyce@embedded-brains.de> References: <20220512121143.21473-1-matthew.joyce@embedded-brains.de> <20220512121143.21473-9-matthew.joyce@embedded-brains.de> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.30; i686-pc-mingw32) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2022 08:37:21 -0000 On Thu, 12 May 2022 14:11:40 +0200 Matthew Joyce wrote: > From: Matt Joyce > > 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 > #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 > #include > #include > +#include /* 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 > After this commit, "ps | cat" outputs nothing in cygwin. However, just "ps" and "ls | cat" works. "stdbuf -o 0 ps | cat" also works. I am not sure this is the right thing, however, I found the following patch solves the issue. It seems that initializing __stdio_exit_handler is missing. diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c index 19952d4e0..e759b5402 100644 --- a/newlib/libc/stdio/findfp.c +++ b/newlib/libc/stdio/findfp.c @@ -63,6 +63,8 @@ struct _glue __sglue = {NULL, 3, &_GLOBAL_REENT->__sf[0]}; #endif #endif +static void stdio_exit_handler (void); + #if (defined (__OPTIMIZE_SIZE__) || defined (PREFER_SIZE_OVER_SPEED)) _NOINLINE_STATIC void #else @@ -109,6 +111,11 @@ std (FILE *ptr, if (__stextmode (ptr->_file)) ptr->_flags |= __SCLE; #endif + + if (__stdio_exit_handler == NULL) { + __sinit (_GLOBAL_REENT); + __stdio_exit_handler = stdio_exit_handler; + } } static inline void Could you please have a look? -- Takashi Yano