drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add _REENT_SIG_FUNC(ptr) 

Add a _REENT_SIG_FUNC() macro to encapsulate access to the
_sig_func member of struct reent. This will help to replace the
struct member with a thread-local storage object in a follow up
patch.
This commit is contained in:
Matt Joyce 2022-02-04 11:47:18 +01:00 committed by Sebastian Huber
parent 81352a9df9
commit db2123caf8
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
newlib/libc/include/sys/reent.h
View File

@ -725,6 +725,7 @@ struct _reent
#define _REENT_ERRNO(_ptr) ((_ptr)->_errno) #define _REENT_ERRNO(_ptr) ((_ptr)->_errno)
#define _REENT_INC(_ptr) ((_ptr)->_inc) #define _REENT_INC(_ptr) ((_ptr)->_inc)
#define _REENT_LOCALE(_ptr) ((_ptr)->_locale) #define _REENT_LOCALE(_ptr) ((_ptr)->_locale)
#define _REENT_SIG_FUNC(_ptr) ((_ptr)->_sig_func)
#define _REENT_STDIN(_ptr) ((_ptr)->_stdin) #define _REENT_STDIN(_ptr) ((_ptr)->_stdin)
#define _REENT_STDOUT(_ptr) ((_ptr)->_stdout) #define _REENT_STDOUT(_ptr) ((_ptr)->_stdout)
#define _REENT_STDERR(_ptr) ((_ptr)->_stderr) #define _REENT_STDERR(_ptr) ((_ptr)->_stderr)

4
newlib/libc/reent/reent.c
View File

@ -83,8 +83,8 @@ _reclaim_reent (struct _reent *ptr)
/* We should free _sig_func to avoid a memory leak, but how to /* We should free _sig_func to avoid a memory leak, but how to
do it safely considering that a signal may be delivered immediately do it safely considering that a signal may be delivered immediately
after the free? after the free?
if (ptr->_sig_func) if (_REENT_SIG_FUNC(ptr))
_free_r (ptr, ptr->_sig_func);*/ _free_r (ptr, _REENT_SIG_FUNC(ptr));*/
if (_REENT_CLEANUP(ptr)) if (_REENT_CLEANUP(ptr))
{ {

26
newlib/libc/signal/signal.c
View File

@ -93,14 +93,14 @@ _init_signal_r (struct _reent *ptr)
{ {
int i; int i;
if (ptr->_sig_func == NULL) if (_REENT_SIG_FUNC(ptr) == NULL)
{ {
ptr->_sig_func = (_sig_func_ptr *)_malloc_r (ptr, sizeof (_sig_func_ptr) * NSIG); _REENT_SIG_FUNC(ptr) = (_sig_func_ptr *)_malloc_r (ptr, sizeof (_sig_func_ptr) * NSIG);
if (ptr->_sig_func == NULL) if (_REENT_SIG_FUNC(ptr) == NULL)
return -1; return -1;
for (i = 0; i < NSIG; i++) for (i = 0; i < NSIG; i++)
ptr->_sig_func[i] = SIG_DFL; _REENT_SIG_FUNC(ptr)[i] = SIG_DFL;
} }
return 0; return 0;
@ -119,11 +119,11 @@ _signal_r (struct _reent *ptr,
return SIG_ERR; return SIG_ERR;
} }
if (ptr->_sig_func == NULL && _init_signal_r (ptr) != 0) if (_REENT_SIG_FUNC(ptr) == NULL && _init_signal_r (ptr) != 0)
return SIG_ERR; return SIG_ERR;
old_func = ptr->_sig_func[sig]; old_func = _REENT_SIG_FUNC(ptr)[sig];
ptr->_sig_func[sig] = func; _REENT_SIG_FUNC(ptr)[sig] = func;
return old_func; return old_func;
} }
@ -140,10 +140,10 @@ _raise_r (struct _reent *ptr,
return -1; return -1;
} }
if (ptr->_sig_func == NULL) if (_REENT_SIG_FUNC(ptr) == NULL)
func = SIG_DFL; func = SIG_DFL;
else else
func = ptr->_sig_func[sig]; func = _REENT_SIG_FUNC(ptr)[sig];
if (func == SIG_DFL) if (func == SIG_DFL)
return _kill_r (ptr, _getpid_r (ptr), sig); return _kill_r (ptr, _getpid_r (ptr), sig);
@ -156,7 +156,7 @@ _raise_r (struct _reent *ptr,
} }
else else
{ {
ptr->_sig_func[sig] = SIG_DFL; _REENT_SIG_FUNC(ptr)[sig] = SIG_DFL;
func (sig); func (sig);
return 0; return 0;
} }
@ -173,10 +173,10 @@ __sigtramp_r (struct _reent *ptr,
return -1; return -1;
} }
if (ptr->_sig_func == NULL && _init_signal_r (ptr) != 0) if (_REENT_SIG_FUNC(ptr) == NULL && _init_signal_r (ptr) != 0)
return -1; return -1;
func = ptr->_sig_func[sig]; func = _REENT_SIG_FUNC(ptr)[sig];
if (func == SIG_DFL) if (func == SIG_DFL)
return 1; return 1;
else if (func == SIG_ERR) else if (func == SIG_ERR)
@ -185,7 +185,7 @@ __sigtramp_r (struct _reent *ptr,
return 3; return 3;
else else
{ {
ptr->_sig_func[sig] = SIG_DFL; _REENT_SIG_FUNC(ptr)[sig] = SIG_DFL;
func (sig); func (sig);
return 0; return 0;
} }