From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id 152FA383D832; Fri, 13 May 2022 11:19:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 152FA383D832 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Sebastian Huber To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Remove __sinit_locks / __sinit_recursive_mutex X-Act-Checkin: newlib-cygwin X-Git-Author: Matt Joyce X-Git-Refname: refs/heads/master X-Git-Oldrev: e5e36867f851b7355e6221a598f604bcae52597f X-Git-Newrev: d83aa402b7ba3e3ec16d247a26cc8343a2e7efa3 Message-Id: <20220513111947.152FA383D832@sourceware.org> Date: Fri, 13 May 2022 11:19:47 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2022 11:19:47 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Dd83aa402b7b= a3e3ec16d247a26cc8343a2e7efa3 commit d83aa402b7ba3e3ec16d247a26cc8343a2e7efa3 Author: Matt Joyce Date: Fri Apr 8 11:24:38 2022 +0200 Remove __sinit_locks / __sinit_recursive_mutex =20 Remove __sinit_lock_acquire() and __sinit_lock_release(). Replace thes= e with __sfp_lock_acquire() and __sfp_lock_release(), respectively. This elim= inates a potential deadlock issue between __sinit() and __sfp(). Remove now unu= sed __sinit_recursive_mutex and __lock___sinit_recursive_mutex. Diff: --- newlib/libc/misc/lock.c | 4 ---- newlib/libc/stdio/findfp.c | 19 +++---------------- newlib/libc/stdio/local.h | 2 -- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/newlib/libc/misc/lock.c b/newlib/libc/misc/lock.c index 545511e78..c03c36a1e 100644 --- a/newlib/libc/misc/lock.c +++ b/newlib/libc/misc/lock.c @@ -2,8 +2,6 @@ FUNCTION <<__retarget_lock_init>>, <<__retarget_lock_init_recursive>>, <<__retarget= _lock_close>>, <<__retarget_lock_close_recursive>>, <<__retarget_lock_acqui= re>>, <<__retarget_lock_acquire_recursive>>, <<__retarget_lock_try_acquire>= >, <<__retarget_lock_try_acquire_recursive>>, <<__retarget_lock_release>>, = <<__retarget_lock_release_recursive>>---locking routines =20 -INDEX - __lock___sinit_recursive_mutex INDEX __lock___sfp_recursive_mutex INDEX @@ -44,7 +42,6 @@ INDEX =20 SYNOPSIS #include - struct __lock __lock___sinit_recursive_mutex; struct __lock __lock___sfp_recursive_mutex; struct __lock __lock___atexit_recursive_mutex; struct __lock __lock___at_quick_exit_mutex; @@ -92,7 +89,6 @@ struct __lock { char unused; }; =20 -struct __lock __lock___sinit_recursive_mutex; struct __lock __lock___sfp_recursive_mutex; struct __lock __lock___atexit_recursive_mutex; struct __lock __lock___at_quick_exit_mutex; diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c index 66867e664..afbdad9b1 100644 --- a/newlib/libc/stdio/findfp.c +++ b/newlib/libc/stdio/findfp.c @@ -235,11 +235,11 @@ cleanup_stdio (struct _reent *ptr) void __sinit (struct _reent *s) { - __sinit_lock_acquire (); + __sfp_lock_acquire (); =20 if (s->__cleanup) { - __sinit_lock_release (); + __sfp_lock_release (); return; } =20 @@ -268,13 +268,12 @@ __sinit (struct _reent *s) stderr_init (s->_stderr); #endif /* _REENT_GLOBAL_STDIO_STREAMS */ =20 - __sinit_lock_release (); + __sfp_lock_release (); } =20 #ifndef __SINGLE_THREAD__ =20 __LOCK_INIT_RECURSIVE(static, __sfp_recursive_mutex); -__LOCK_INIT_RECURSIVE(static, __sinit_recursive_mutex); =20 void __sfp_lock_acquire (void) @@ -288,18 +287,6 @@ __sfp_lock_release (void) __lock_release_recursive (__sfp_recursive_mutex); } =20 -void -__sinit_lock_acquire (void) -{ - __lock_acquire_recursive (__sinit_recursive_mutex); -} - -void -__sinit_lock_release (void) -{ - __lock_release_recursive (__sinit_recursive_mutex); -} - /* Walkable file locking routine. */ static int __fp_lock (struct _reent * ptr __unused, FILE * fp) diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h index 30c534dcd..9c6f63fdb 100644 --- a/newlib/libc/stdio/local.h +++ b/newlib/libc/stdio/local.h @@ -287,8 +287,6 @@ char *_llicvt (char *, long long, char); #else void __sfp_lock_acquire (void); void __sfp_lock_release (void); -void __sinit_lock_acquire (void); -void __sinit_lock_release (void); #endif =20 /* Types used in positional argument support in vfprinf/vfwprintf.