diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2022-04-01 14:32:32 +0300 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2022-05-13 13:40:10 +0300 |
commit | 3941c8a88ad1a1670ceac6e1889496174efd398f (patch) | |
tree | e1104a7e796b60838366d810731959ae13c3ba20 /newlib/libc/stdio | |
parent | 26747c47bc0a1137e02e0377306d721cc3478855 (diff) |
stdio: Replace _fwalk_reent() with _fwalk_sglue()
Replaced _fwalk_reent() with _fwalk_sglue(). The change adds an
extra __sglue object as a parameter, which will allow the passing
of a global __sglue object separate from the __sglue member of
struct _reent. The global __sglue object will be added in a
follow-on patch.
Diffstat (limited to 'newlib/libc/stdio')
-rw-r--r-- | newlib/libc/stdio/fcloseall.c | 2 | ||||
-rw-r--r-- | newlib/libc/stdio/fflush.c | 2 | ||||
-rw-r--r-- | newlib/libc/stdio/findfp.c | 14 | ||||
-rw-r--r-- | newlib/libc/stdio/fwalk.c | 16 | ||||
-rw-r--r-- | newlib/libc/stdio/local.h | 1 | ||||
-rw-r--r-- | newlib/libc/stdio/refill.c | 4 |
6 files changed, 22 insertions, 17 deletions
diff --git a/newlib/libc/stdio/fcloseall.c b/newlib/libc/stdio/fcloseall.c index 014c451cd..4d4e3554b 100644 --- a/newlib/libc/stdio/fcloseall.c +++ b/newlib/libc/stdio/fcloseall.c @@ -59,7 +59,7 @@ Required OS subroutines: <<close>>, <<fstat>>, <<isatty>>, <<lseek>>, int _fcloseall_r (struct _reent *ptr) { - return _fwalk_reent (ptr, _fclose_r); + return _fwalk_sglue (ptr, _fclose_r, &ptr->__sglue); } #ifndef _REENT_ONLY diff --git a/newlib/libc/stdio/fflush.c b/newlib/libc/stdio/fflush.c index 2b5f13bff..6e946da7b 100644 --- a/newlib/libc/stdio/fflush.c +++ b/newlib/libc/stdio/fflush.c @@ -286,7 +286,7 @@ int fflush (register FILE * fp) { if (fp == NULL) - return _fwalk_reent (_GLOBAL_REENT, _fflush_r); + return _fwalk_sglue (_GLOBAL_REENT, _fflush_r, &_GLOBAL_REENT->__sglue); return _fflush_r (_REENT, fp); } diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c index 719886e27..1627032a3 100644 --- a/newlib/libc/stdio/findfp.c +++ b/newlib/libc/stdio/findfp.c @@ -158,7 +158,7 @@ sfmoreglue (struct _reent *d, int n) static void stdio_exit_handler (void) { - (void) _fwalk_reent (_GLOBAL_REENT, CLEANUP_FILE); + (void) _fwalk_sglue (_GLOBAL_REENT, CLEANUP_FILE, &_GLOBAL_REENT->__sglue); } /* @@ -240,7 +240,7 @@ cleanup_stdio (struct _reent *ptr) if (ptr->_stderr != &__sf[2]) CLEANUP_FILE (ptr, ptr->_stderr); #endif - (void) _fwalk_reent (ptr, CLEANUP_FILE); + (void) _fwalk_sglue (ptr, CLEANUP_FILE, &ptr->__sglue); } /* @@ -323,15 +323,21 @@ __fp_unlock (struct _reent * ptr __unused, FILE * fp) void __fp_lock_all (void) { + struct _reent *ptr; + __sfp_lock_acquire (); - (void) _fwalk_reent (_REENT, __fp_lock); + ptr = _REENT; + (void) _fwalk_sglue (ptr, __fp_lock, &ptr->__sglue); } void __fp_unlock_all (void) { - (void) _fwalk_reent (_REENT, __fp_unlock); + struct _reent *ptr; + + ptr = _REENT; + (void) _fwalk_sglue (ptr, __fp_unlock, &ptr->__sglue); __sfp_lock_release (); } diff --git a/newlib/libc/stdio/fwalk.c b/newlib/libc/stdio/fwalk.c index 2cefcc40e..b1284c6ea 100644 --- a/newlib/libc/stdio/fwalk.c +++ b/newlib/libc/stdio/fwalk.c @@ -25,15 +25,13 @@ static char sccsid[] = "%W% (Berkeley) %G%"; #include <stdio.h> #include <stdlib.h> #include <errno.h> -#include "local.h" int -_fwalk_reent (struct _reent *ptr, - register int (*reent_function) (struct _reent *, FILE *)) +_fwalk_sglue (struct _reent *ptr, int (*func) (struct _reent *, FILE *), + struct _glue *g) { - register FILE *fp; - register int n, ret = 0; - register struct _glue *g; + FILE *fp; + int n, ret = 0; /* * It should be safe to walk the list without locking it; @@ -43,10 +41,12 @@ _fwalk_reent (struct _reent *ptr, * Avoid locking this list while walking it or else you will * introduce a potential deadlock in [at least] refill.c. */ - for (g = &ptr->__sglue; g != NULL; g = g->_next) + do { for (fp = g->_iobs, n = g->_niobs; --n >= 0; fp++) if (fp->_flags != 0 && fp->_flags != 1 && fp->_file != -1) - ret |= (*reent_function) (ptr, fp); + ret |= (*func) (ptr, fp); + g = g->_next; + } while (g != NULL); return ret; } diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h index 9c6f63fdb..e245fdb4e 100644 --- a/newlib/libc/stdio/local.h +++ b/newlib/libc/stdio/local.h @@ -182,7 +182,6 @@ extern int __stextmode (int); extern void __sinit (struct _reent *); extern void __smakebuf_r (struct _reent *, FILE *); extern int __swhatbuf_r (struct _reent *, FILE *, size_t *, int *); -extern int _fwalk_reent (struct _reent *, int (*)(struct _reent *, FILE *)); extern int __submore (struct _reent *, FILE *); #ifdef __LARGE64_FILES diff --git a/newlib/libc/stdio/refill.c b/newlib/libc/stdio/refill.c index 31665bcd9..4084d7250 100644 --- a/newlib/libc/stdio/refill.c +++ b/newlib/libc/stdio/refill.c @@ -102,10 +102,10 @@ __srefill_r (struct _reent * ptr, */ if (fp->_flags & (__SLBF | __SNBF)) { - /* Ignore this file in _fwalk_reent to avoid potential deadlock. */ + /* Ignore this file in _fwalk_sglue to avoid potential deadlock. */ short orig_flags = fp->_flags; fp->_flags = 1; - (void) _fwalk_reent (_GLOBAL_REENT, lflush); + (void) _fwalk_sglue (_GLOBAL_REENT, lflush, &_GLOBAL_REENT->__sglue); fp->_flags = orig_flags; /* Now flush this file without locking it. */ |