From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dedi548.your-server.de (dedi548.your-server.de [85.10.215.148]) by sourceware.org (Postfix) with ESMTPS id BB9033836011 for ; Tue, 10 May 2022 08:09:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BB9033836011 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embedded-brains.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embedded-brains.de Received: from sslproxy06.your-server.de ([78.46.172.3]) by dedi548.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1noKw9-000MqR-Ad for newlib@sourceware.org; Tue, 10 May 2022 10:09:41 +0200 Received: from [82.100.198.138] (helo=mail.embedded-brains.de) by sslproxy06.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1noKw9-000HIO-ED for newlib@sourceware.org; Tue, 10 May 2022 10:09:41 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 1DA5748013D for ; Tue, 10 May 2022 10:09:41 +0200 (CEST) Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id B_9k1IKwZP6V; Tue, 10 May 2022 10:09:40 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 92ACB480171; Tue, 10 May 2022 10:09:40 +0200 (CEST) X-Virus-Scanned: amavisd-new at zimbra.eb.localhost Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id kPRFWY2SRp4r; Tue, 10 May 2022 10:09:40 +0200 (CEST) Received: from joyce-tux.eb.localhost (unknown [10.10.171.30]) by mail.embedded-brains.de (Postfix) with ESMTPSA id 66C2A4800B0; Tue, 10 May 2022 10:09:40 +0200 (CEST) From: Matthew Joyce To: newlib@sourceware.org Subject: [PATCH 09/11] stdio: Replace _fwalk_reent() with _fwalk_sglue() Date: Tue, 10 May 2022 10:09:25 +0200 Message-Id: <20220510080927.28839-10-matthew.joyce@embedded-brains.de> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220510080927.28839-1-matthew.joyce@embedded-brains.de> References: <20220510080927.28839-1-matthew.joyce@embedded-brains.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authenticated-Sender: smtp-embedded@poldinet.de X-Virus-Scanned: Clear (ClamAV 0.103.5/26536/Mon May 9 10:04:57 2022) X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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, 10 May 2022 08:09:44 -0000 From: Sebastian Huber Replaced _fwalk_reent() with _fwalk_sglue(). The change adds an extra __sglue object as a parameter, which will allow the passing of a global __sglue object separate from the __sglue member of struct _reent. The global __sglue object will be added in a follow-on patch. --- newlib/libc/stdio/fcloseall.c | 2 +- newlib/libc/stdio/fflush.c | 2 +- newlib/libc/stdio/findfp.c | 14 ++++++++++---- newlib/libc/stdio/fwalk.c | 15 ++++++++------- newlib/libc/stdio/local.h | 3 ++- newlib/libc/stdio/refill.c | 4 ++-- winsup/cygwin/syscalls.cc | 5 +++-- 7 files changed, 27 insertions(+), 18 deletions(-) diff --git a/newlib/libc/stdio/fcloseall.c b/newlib/libc/stdio/fcloseall.= c index 014c451cd..4d4e3554b 100644 --- a/newlib/libc/stdio/fcloseall.c +++ b/newlib/libc/stdio/fcloseall.c @@ -59,7 +59,7 @@ Required OS subroutines: <>, <>, <>, <>, int _fcloseall_r (struct _reent *ptr) { - return _fwalk_reent (ptr, _fclose_r); + return _fwalk_sglue (ptr, _fclose_r, &ptr->__sglue); } =20 #ifndef _REENT_ONLY diff --git a/newlib/libc/stdio/fflush.c b/newlib/libc/stdio/fflush.c index 2b5f13bff..6e946da7b 100644 --- a/newlib/libc/stdio/fflush.c +++ b/newlib/libc/stdio/fflush.c @@ -286,7 +286,7 @@ int fflush (register FILE * fp) { if (fp =3D=3D NULL) - return _fwalk_reent (_GLOBAL_REENT, _fflush_r); + return _fwalk_sglue (_GLOBAL_REENT, _fflush_r, &_GLOBAL_REENT->__sgl= ue); =20 return _fflush_r (_REENT, fp); } diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c index 022a298df..221052bd4 100644 --- a/newlib/libc/stdio/findfp.c +++ b/newlib/libc/stdio/findfp.c @@ -158,7 +158,7 @@ sfmoreglue (struct _reent *d, int n) static void stdio_atexit (void) { - (void) _fwalk_reent (_GLOBAL_REENT, CLEANUP_FILE); + (void) _fwalk_sglue (_GLOBAL_REENT, CLEANUP_FILE, &_GLOBAL_REENT->__sg= lue); } =20 /* @@ -240,7 +240,7 @@ cleanup_stdio (struct _reent *ptr) if (ptr->_stderr !=3D &__sf[2]) CLEANUP_FILE (ptr, ptr->_stderr); #endif - (void) _fwalk_reent (ptr, CLEANUP_FILE); + (void) _fwalk_sglue (ptr, CLEANUP_FILE, &ptr->__sglue); } =20 /* @@ -323,15 +323,21 @@ __fp_unlock (struct _reent * ptr __unused, FILE * f= p) void __fp_lock_all (void) { + struct _reent *ptr; + __sfp_lock_acquire (); =20 - (void) _fwalk_reent (_REENT, __fp_lock); + ptr =3D _REENT; + (void) _fwalk_sglue (ptr, __fp_lock, &ptr->__sglue); } =20 void __fp_unlock_all (void) { - (void) _fwalk_reent (_REENT, __fp_unlock); + struct _reent *ptr; + + ptr =3D _REENT; + (void) _fwalk_sglue (ptr, __fp_unlock, &ptr->__sglue); =20 __sfp_lock_release (); } diff --git a/newlib/libc/stdio/fwalk.c b/newlib/libc/stdio/fwalk.c index 2cefcc40e..0fdad9d31 100644 --- a/newlib/libc/stdio/fwalk.c +++ b/newlib/libc/stdio/fwalk.c @@ -28,12 +28,11 @@ static char sccsid[] =3D "%W% (Berkeley) %G%"; #include "local.h" =20 int -_fwalk_reent (struct _reent *ptr, - register int (*reent_function) (struct _reent *, FILE *)) +_fwalk_sglue (struct _reent *ptr, int (*func) (struct _reent *, FILE *), + struct _glue *g) { - register FILE *fp; - register int n, ret =3D 0; - register struct _glue *g; + FILE *fp; + int n, ret =3D 0; =20 /* * It should be safe to walk the list without locking it; @@ -43,10 +42,12 @@ _fwalk_reent (struct _reent *ptr, * Avoid locking this list while walking it or else you will * introduce a potential deadlock in [at least] refill.c. */ - for (g =3D &ptr->__sglue; g !=3D NULL; g =3D g->_next) + do { for (fp =3D g->_iobs, n =3D g->_niobs; --n >=3D 0; fp++) if (fp->_flags !=3D 0 && fp->_flags !=3D 1 && fp->_file !=3D -1) - ret |=3D (*reent_function) (ptr, fp); + ret |=3D (*func) (ptr, fp); + g =3D g->_next; + } while (g !=3D NULL); =20 return ret; } diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h index c892f8378..0c1432d67 100644 --- a/newlib/libc/stdio/local.h +++ b/newlib/libc/stdio/local.h @@ -183,7 +183,8 @@ extern void __sinit (struct _reent *); extern void (*__stdio_atexit) (void); extern void __smakebuf_r (struct _reent *, FILE *); extern int __swhatbuf_r (struct _reent *, FILE *, size_t *, int *); -extern int _fwalk_reent (struct _reent *, int (*)(struct _reent *, FI= LE *)); +extern int _fwalk_sglue (struct _reent *, int (*)(struct _reent *, FI= LE *), + struct _glue *); extern int __submore (struct _reent *, FILE *); =20 #ifdef __LARGE64_FILES diff --git a/newlib/libc/stdio/refill.c b/newlib/libc/stdio/refill.c index 31665bcd9..4084d7250 100644 --- a/newlib/libc/stdio/refill.c +++ b/newlib/libc/stdio/refill.c @@ -102,10 +102,10 @@ __srefill_r (struct _reent * ptr, */ if (fp->_flags & (__SLBF | __SNBF)) { - /* Ignore this file in _fwalk_reent to avoid potential deadlock. *= / + /* Ignore this file in _fwalk_sglue to avoid potential deadlock. *= / short orig_flags =3D fp->_flags; fp->_flags =3D 1; - (void) _fwalk_reent (_GLOBAL_REENT, lflush); + (void) _fwalk_sglue (_GLOBAL_REENT, lflush, &_GLOBAL_REENT->__sglu= e); fp->_flags =3D orig_flags; =20 /* Now flush this file without locking it. */ diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 1cecaa017..5bf6d8fc7 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -3058,7 +3058,8 @@ _cygwin_istext_for_stdio (int fd) } =20 /* internal newlib function */ -extern "C" int _fwalk_reent (struct _reent *ptr, int (*function) (struct= _reent *, FILE *)); +extern "C" int _fwalk_sglue (struct _reent *ptr, + int (*function) (struct _reent *, FILE *), struct _sglue *); =20 static int setmode_helper (struct _reent *ptr __unused, FILE *f) @@ -3137,7 +3138,7 @@ cygwin_setmode (int fd, int mode) _my_tls.locals.setmode_mode =3D O_TEXT; else _my_tls.locals.setmode_mode =3D O_BINARY; - _fwalk_reent (_GLOBAL_REENT, setmode_helper); + _fwalk_sglue (_GLOBAL_REENT, setmode_helper, &_GLOBAL_REENT->__sgl= ue); } return res; } --=20 2.31.1