public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin] Remove __sinit_locks / __sinit_recursive_mutex
@ 2022-05-13 11:19 Sebastian Huber
0 siblings, 0 replies; only message in thread
From: Sebastian Huber @ 2022-05-13 11:19 UTC (permalink / raw)
To: newlib-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=d83aa402b7ba3e3ec16d247a26cc8343a2e7efa3
commit d83aa402b7ba3e3ec16d247a26cc8343a2e7efa3
Author: Matt Joyce <matthew.joyce@embedded-brains.de>
Date: Fri Apr 8 11:24:38 2022 +0200
Remove __sinit_locks / __sinit_recursive_mutex
Remove __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(). Remove now unused
__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_acquire>>, <<__retarget_lock_acquire_recursive>>, <<__retarget_lock_try_acquire>>, <<__retarget_lock_try_acquire_recursive>>, <<__retarget_lock_release>>, <<__retarget_lock_release_recursive>>---locking routines
-INDEX
- __lock___sinit_recursive_mutex
INDEX
__lock___sfp_recursive_mutex
INDEX
@@ -44,7 +42,6 @@ INDEX
SYNOPSIS
#include <lock.h>
- 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;
};
-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 ();
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.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-05-13 11:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-13 11:19 [newlib-cygwin] Remove __sinit_locks / __sinit_recursive_mutex Sebastian Huber
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).