From: Sebastian Huber <sebastian.huber@embedded-brains.de>
To: newlib@sourceware.org
Subject: [PATCH 09/14] Add _REENT_CLEANUP(ptr)
Date: Tue, 21 Jun 2022 14:49:26 +0200 [thread overview]
Message-ID: <20220621124931.36450-10-sebastian.huber@embedded-brains.de> (raw)
In-Reply-To: <20220621124931.36450-1-sebastian.huber@embedded-brains.de>
From: Matt Joyce <matthew.joyce@embedded-brains.de>
Add a _REENT_CLEANUP() macro to encapsulate access to the
__cleanup member of struct reent. This will help to replace the
struct member with a thread-local storage object in a follow up
patch.
---
newlib/libc/include/sys/reent.h | 1 +
newlib/libc/machine/spu/c99ppe.h | 2 +-
newlib/libc/machine/spu/stdio.c | 2 +-
newlib/libc/reent/reent.c | 4 ++--
newlib/libc/stdio/findfp.c | 4 ++--
newlib/libc/stdio/local.h | 2 +-
newlib/libc/stdio/setvbuf.c | 2 +-
newlib/libc/sys/arm/syscalls.c | 2 +-
winsup/cygwin/cygtls.cc | 2 +-
winsup/cygwin/dcrt0.cc | 2 +-
10 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index 4296188f5..3d277638f 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -718,6 +718,7 @@ struct _reent
#endif /* !_REENT_SMALL */
+#define _REENT_CLEANUP(_ptr) ((_ptr)->__cleanup)
#define _REENT_EMERGENCY(_ptr) ((_ptr)->_emergency)
#define _REENT_ERRNO(_ptr) ((_ptr)->_errno)
#define _REENT_INC(_ptr) ((_ptr)->_inc)
diff --git a/newlib/libc/machine/spu/c99ppe.h b/newlib/libc/machine/spu/c99ppe.h
index 263cf7fe0..7b3fcb6b7 100644
--- a/newlib/libc/machine/spu/c99ppe.h
+++ b/newlib/libc/machine/spu/c99ppe.h
@@ -104,6 +104,6 @@ FILE *__sfp (struct _reent *);
#define __sfp_free(fp) ( (fp)->_fp = 0 )
#define CHECK_INIT(ptr) \
- do { if ((ptr) && !(ptr)->__cleanup) __sinit (ptr); } while (0)
+ do { if ((ptr) && !_REENT_CLEANUP(ptr)) __sinit (ptr); } while (0)
#define CHECK_STR_INIT(ptr) /* currently, do nothing */
#endif /* __ASSEMBLER__ */
diff --git a/newlib/libc/machine/spu/stdio.c b/newlib/libc/machine/spu/stdio.c
index 83a60c06b..fd45b0014 100644
--- a/newlib/libc/machine/spu/stdio.c
+++ b/newlib/libc/machine/spu/stdio.c
@@ -65,7 +65,7 @@ __cleanup (struct _reent *s)
void
__sinit (struct _reent *s)
{
- s->__cleanup = __cleanup;
+ _REENT_CLEANUP(s) = __cleanup;
_REENT_STDIN(s) = &s->__sf[0];
_REENT_STDIN(s)->_fp = SPE_STDIN;
diff --git a/newlib/libc/reent/reent.c b/newlib/libc/reent/reent.c
index a9d44b455..16ac04e22 100644
--- a/newlib/libc/reent/reent.c
+++ b/newlib/libc/reent/reent.c
@@ -86,11 +86,11 @@ _reclaim_reent (struct _reent *ptr)
if (ptr->_sig_func)
_free_r (ptr, ptr->_sig_func);*/
- if (ptr->__cleanup)
+ if (_REENT_CLEANUP(ptr))
{
/* cleanup won't reclaim memory 'coz usually it's run
before the program exits, and who wants to wait for that? */
- ptr->__cleanup (ptr);
+ _REENT_CLEANUP(ptr) (ptr);
}
/* Malloc memory not reclaimed; no good way to return memory anyway. */
diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
index 3c888d03c..fbdb7f2f2 100644
--- a/newlib/libc/stdio/findfp.c
+++ b/newlib/libc/stdio/findfp.c
@@ -235,14 +235,14 @@ __sinit (struct _reent *s)
{
__sfp_lock_acquire ();
- if (s->__cleanup)
+ if (_REENT_CLEANUP(s))
{
__sfp_lock_release ();
return;
}
/* make sure we clean up on exit */
- s->__cleanup = cleanup_stdio; /* conservative */
+ _REENT_CLEANUP(s) = cleanup_stdio; /* conservative */
global_stdio_init ();
__sfp_lock_release ();
diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h
index 9b355e3ac..24eaff351 100644
--- a/newlib/libc/stdio/local.h
+++ b/newlib/libc/stdio/local.h
@@ -197,7 +197,7 @@ extern _READ_WRITE_RETURN_TYPE __swrite64 (struct _reent *, void *,
do \
{ \
struct _reent *_check_init_ptr = (ptr); \
- if ((_check_init_ptr) && !(_check_init_ptr)->__cleanup) \
+ if ((_check_init_ptr) && !_REENT_CLEANUP(_check_init_ptr))\
__sinit (_check_init_ptr); \
} \
while (0)
diff --git a/newlib/libc/stdio/setvbuf.c b/newlib/libc/stdio/setvbuf.c
index 46c58a7b8..e27ea086c 100644
--- a/newlib/libc/stdio/setvbuf.c
+++ b/newlib/libc/stdio/setvbuf.c
@@ -174,7 +174,7 @@ nbf:
* We're committed to buffering from here, so make sure we've
* registered to flush buffers on exit.
*/
- if (!reent->__cleanup)
+ if (!_REENT_CLEANUP(reent))
__sinit(reent);
#ifdef _FSEEK_OPTIMIZATION
diff --git a/newlib/libc/sys/arm/syscalls.c b/newlib/libc/sys/arm/syscalls.c
index 4b9be701a..325c0117f 100644
--- a/newlib/libc/sys/arm/syscalls.c
+++ b/newlib/libc/sys/arm/syscalls.c
@@ -60,7 +60,7 @@ extern void __sinit (struct _reent *);
#define CHECK_INIT(ptr) \
do \
{ \
- if ((ptr) && !(ptr)->__cleanup) \
+ if ((ptr) && !_REENT_CLEANUP(ptr)) \
__sinit (ptr); \
} \
while (0)
diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc
index 866342613..d0f4426c8 100644
--- a/winsup/cygwin/cygtls.cc
+++ b/winsup/cygwin/cygtls.cc
@@ -55,7 +55,7 @@ _cygtls::init_thread (void *x, DWORD (*func) (void *, void *))
_REENT_INIT_PTR (&local_clib);
stackptr = stack;
altstack.ss_flags = SS_DISABLE;
- if (_GLOBAL_REENT->__cleanup)
+ if (_REENT_CLEANUP(_GLOBAL_REENT))
local_clib.__cleanup = _cygtls::cleanup_early;
}
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 9cbb8908f..897a2fba3 100644
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -800,7 +800,7 @@ main_thread_sinit ()
read or written in the first stdio function call in the main thread.
To fix this issue we set __cleanup to _cygtls::cleanup_early here. */
- _REENT->__cleanup = _cygtls::cleanup_early;
+ _REENT_CLEANUP(_REENT) = _cygtls::cleanup_early;
}
/* Take over from libc's crt0.o and start the application. Note the
--
2.35.3
next prev parent reply other threads:[~2022-06-21 12:49 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-21 12:49 [PATCH 00/14] Add --enable-newlib-reent-thread-local option Sebastian Huber
2022-06-21 12:49 ` [PATCH 01/14] Move content in <sys/reent.h> Sebastian Huber
2022-06-21 12:49 ` [PATCH 02/14] Define _REENT_EMERGENCY(ptr) only once Sebastian Huber
2022-06-21 12:49 ` [PATCH 03/14] Add _REENT_ERRNO(ptr) Sebastian Huber
[not found] ` <BN2P110MB15447CD8C6DD815779AA7E4C9AB39@BN2P110MB1544.NAMP110.PROD.OUTLOOK.COM>
2022-06-21 14:41 ` Fw: " C Howland
2022-06-23 10:55 ` Sebastian Huber
2022-07-11 7:41 ` Sebastian Huber
2022-07-12 16:11 ` Corinna Vinschen
2022-07-12 16:38 ` Sebastian Huber
2022-07-12 18:25 ` Corinna Vinschen
2022-07-13 7:17 ` Sebastian Huber
2022-07-13 7:50 ` Corinna Vinschen
2022-07-13 8:19 ` Sebastian Huber
2022-07-13 11:13 ` Corinna Vinschen
2022-06-21 12:49 ` [PATCH 04/14] Add _REENT_STDIN(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 05/14] Add _REENT_STDOUT(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 06/14] Add _REENT_STDERR(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 07/14] Add _REENT_INC(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 08/14] Add _REENT_LOCALE(ptr) Sebastian Huber
2022-06-21 12:49 ` Sebastian Huber [this message]
2022-06-21 12:49 ` [PATCH 10/14] Add _REENT_CVTLEN(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 11/14] Add _REENT_CVTBUF(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 12/14] Add _REENT_SIG_FUNC(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 13/14] Add _REENT_IS_NULL() Sebastian Huber
2022-06-21 12:49 ` [PATCH 14/14] Add --enable-newlib-reent-thread-local option Sebastian Huber
2022-06-21 13:59 ` Torbjorn SVENSSON
2022-06-21 15:10 ` Sebastian Huber
2022-07-12 11:18 ` [PATCH 00/14] " Sebastian Huber
2022-07-12 14:45 ` Corinna Vinschen
2022-07-12 15:53 ` Sebastian Huber
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=20220621124931.36450-10-sebastian.huber@embedded-brains.de \
--to=sebastian.huber@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).