public inbox for newlib@sourceware.org
 help / color / mirror / Atom feed
From: Matthew Joyce <matthew.joyce@embedded-brains.de>
To: newlib@sourceware.org
Subject: [PATCH 05/11] Remove __sinit_locks / __sinit_recursive_mutex
Date: Tue, 10 May 2022 10:09:21 +0200	[thread overview]
Message-ID: <20220510080927.28839-6-matthew.joyce@embedded-brains.de> (raw)
In-Reply-To: <20220510080927.28839-1-matthew.joyce@embedded-brains.de>

From: Matt Joyce <matthew.joyce@embedded-brains.de>

Removed __sinit_lock_acquire() and __sinit_lock_release(). Replace these
with __sfp_lock_acquire() and __sfp_lock_release(), respectively. This
eliminates a potential deadlock issue between __sinit() and __sfp().
Removed now unused __sinit_recursive_mutex.
---
 newlib/libc/stdio/findfp.c | 19 +++----------------
 newlib/libc/stdio/local.h  |  2 --
 2 files changed, 3 insertions(+), 18 deletions(-)

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 ();
 
   if (s->__cleanup)
     {
-      __sinit_lock_release ();
+      __sfp_lock_release ();
       return;
     }
 
@@ -268,13 +268,12 @@ __sinit (struct _reent *s)
   stderr_init (s->_stderr);
 #endif /* _REENT_GLOBAL_STDIO_STREAMS */
 
-  __sinit_lock_release ();
+  __sfp_lock_release ();
 }
 
 #ifndef __SINGLE_THREAD__
 
 __LOCK_INIT_RECURSIVE(static, __sfp_recursive_mutex);
-__LOCK_INIT_RECURSIVE(static, __sinit_recursive_mutex);
 
 void
 __sfp_lock_acquire (void)
@@ -288,18 +287,6 @@ __sfp_lock_release (void)
   __lock_release_recursive (__sfp_recursive_mutex);
 }
 
-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
 
 /* Types used in positional argument support in vfprinf/vfwprintf.
-- 
2.31.1


  parent reply	other threads:[~2022-05-10  8:09 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-10  8:09 [PATCH 00/11] Decouple global file object list from _GLOBAL_REENT Matthew Joyce
2022-05-10  8:09 ` [PATCH 01/11] Remove duplicate stdio initializations Matthew Joyce
2022-05-10  8:09 ` [PATCH 02/11] Remove duplicate sglue initializations Matthew Joyce
2022-05-10  8:09 ` [PATCH 03/11] Declare global __sf[] only once Matthew Joyce
2022-05-10  8:09 ` [PATCH 04/11] Add two __sglue initialization macros Matthew Joyce
2022-05-10  8:09 ` Matthew Joyce [this message]
2022-05-10  8:09 ` [PATCH 06/11] Move __sglue initializations to __sfp() Matthew Joyce
2022-05-10  8:09 ` [PATCH 07/11] Add CLEANUP_FILE define Matthew Joyce
2022-05-10  8:09 ` [PATCH 08/11] Add stdio atexit handler Matthew Joyce
2022-05-11 15:23   ` Corinna Vinschen
2022-05-11 16:54     ` Corinna Vinschen
2022-05-11 17:51       ` Sebastian Huber
2022-05-11 17:51     ` Sebastian Huber
2022-05-10  8:09 ` [PATCH 09/11] stdio: Replace _fwalk_reent() with _fwalk_sglue() Matthew Joyce
2022-05-11 15:56   ` Corinna Vinschen
2022-05-11 17:55     ` Sebastian Huber
2022-05-12  7:59       ` Corinna Vinschen
2022-05-10  8:09 ` [PATCH 10/11] Add global __sglue object for all configurations Matthew Joyce
2022-05-10  8:09 ` [PATCH 11/11] Remove __sglue member for one configuration Matthew Joyce

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=20220510080927.28839-6-matthew.joyce@embedded-brains.de \
    --to=matthew.joyce@embedded-brains.de \
    --cc=newlib@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: link
Be 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).