public inbox for newlib@sourceware.org
 help / color / mirror / Atom feed
* [PATCH v2] Restore _lock initialization in non-single threaded mode
@ 2022-08-30 13:54 Torbjörn SVENSSON
  2022-08-30 13:54 ` Torbjörn SVENSSON
  2022-08-31  8:07 ` Corinna Vinschen
  0 siblings, 2 replies; 3+ messages in thread
From: Torbjörn SVENSSON @ 2022-08-30 13:54 UTC (permalink / raw)
  To: newlib; +Cc: Torbjörn SVENSSON

When __SINGLE_THREAD__ is not defined, stdin, stdout and stderr needs
to have their _lock instance initialized. The __sfp() method is not
invoked for the 3 mentioned fds thus, the std() method needs to handle
the initialization of the lock.

This is more or less a revert of 382550072b49430f8c69adee937a0ba07bd385e6

Contributed by STMicroelectronics

Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
---
 newlib/libc/stdio/findfp.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
index c43028209..2cc549537 100644
--- a/newlib/libc/stdio/findfp.c
+++ b/newlib/libc/stdio/findfp.c
@@ -88,6 +88,10 @@ std (FILE *ptr,
 #else /* _STDIO_CLOSE_STD_STREAMS */
   ptr->_close = NULL;
 #endif /* _STDIO_CLOSE_STD_STREAMS */
+#ifndef __SINGLE_THREAD__
+  if (ptr == &__sf[0] || ptr == &__sf[1] || ptr == &__sf[2])
+    __lock_init_recursive (ptr->_lock);
+#endif
 #ifdef __SCLE
   if (__stextmode (ptr->_file))
     ptr->_flags |= __SCLE;
-- 
2.25.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH v2] Restore _lock initialization in non-single threaded mode
  2022-08-30 13:54 [PATCH v2] Restore _lock initialization in non-single threaded mode Torbjörn SVENSSON
@ 2022-08-30 13:54 ` Torbjörn SVENSSON
  2022-08-31  8:07 ` Corinna Vinschen
  1 sibling, 0 replies; 3+ messages in thread
From: Torbjörn SVENSSON @ 2022-08-30 13:54 UTC (permalink / raw)
  To: newlib

When __SINGLE_THREAD__ is not defined, stdin, stdout and stderr needs
to have their _lock instance initialized. The __sfp() method is not
invoked for the 3 mentioned fds thus, the std() method needs to handle
the initialization of the lock.

This is more or less a revert of 382550072b49430f8c69adee937a0ba07bd385e6

Contributed by STMicroelectronics

Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
---
 newlib/libc/stdio/findfp.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
index c43028209..2cc549537 100644
--- a/newlib/libc/stdio/findfp.c
+++ b/newlib/libc/stdio/findfp.c
@@ -88,6 +88,10 @@ std (FILE *ptr,
 #else /* _STDIO_CLOSE_STD_STREAMS */
   ptr->_close = NULL;
 #endif /* _STDIO_CLOSE_STD_STREAMS */
+#ifndef __SINGLE_THREAD__
+  if (ptr == &__sf[0] || ptr == &__sf[1] || ptr == &__sf[2])
+    __lock_init_recursive (ptr->_lock);
+#endif
 #ifdef __SCLE
   if (__stextmode (ptr->_file))
     ptr->_flags |= __SCLE;
-- 
2.25.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] Restore _lock initialization in non-single threaded mode
  2022-08-30 13:54 [PATCH v2] Restore _lock initialization in non-single threaded mode Torbjörn SVENSSON
  2022-08-30 13:54 ` Torbjörn SVENSSON
@ 2022-08-31  8:07 ` Corinna Vinschen
  1 sibling, 0 replies; 3+ messages in thread
From: Corinna Vinschen @ 2022-08-31  8:07 UTC (permalink / raw)
  To: newlib

On Aug 30 15:54, Torbjörn SVENSSON wrote:
> When __SINGLE_THREAD__ is not defined, stdin, stdout and stderr needs
> to have their _lock instance initialized. The __sfp() method is not
> invoked for the 3 mentioned fds thus, the std() method needs to handle
> the initialization of the lock.
> 
> This is more or less a revert of 382550072b49430f8c69adee937a0ba07bd385e6
> 
> Contributed by STMicroelectronics
> 
> Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
> ---
>  newlib/libc/stdio/findfp.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
> index c43028209..2cc549537 100644
> --- a/newlib/libc/stdio/findfp.c
> +++ b/newlib/libc/stdio/findfp.c
> @@ -88,6 +88,10 @@ std (FILE *ptr,
>  #else /* _STDIO_CLOSE_STD_STREAMS */
>    ptr->_close = NULL;
>  #endif /* _STDIO_CLOSE_STD_STREAMS */
> +#ifndef __SINGLE_THREAD__
> +  if (ptr == &__sf[0] || ptr == &__sf[1] || ptr == &__sf[2])
> +    __lock_init_recursive (ptr->_lock);
> +#endif
>  #ifdef __SCLE
>    if (__stextmode (ptr->_file))
>      ptr->_flags |= __SCLE;
> -- 
> 2.25.1

Pushed.


Thanks,
Corinna


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-08-31  8:07 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-30 13:54 [PATCH v2] Restore _lock initialization in non-single threaded mode Torbjörn SVENSSON
2022-08-30 13:54 ` Torbjörn SVENSSON
2022-08-31  8:07 ` Corinna Vinschen

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).