From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id 630BB3857C71; Wed, 13 Jul 2022 08:20:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 630BB3857C71 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Sebastian Huber To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Add _REENT_SIG_FUNC(ptr) X-Act-Checkin: newlib-cygwin X-Git-Author: Matt Joyce X-Git-Refname: refs/heads/master X-Git-Oldrev: 81352a9df9d7c8ce9f9dc63126e4cfbd8ff4a082 X-Git-Newrev: db2123caf8501a6d2fe0a75a4d196492b68d99c6 Message-Id: <20220713082003.630BB3857C71@sourceware.org> Date: Wed, 13 Jul 2022 08:20:03 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2022 08:20:03 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Ddb2123caf85= 01a6d2fe0a75a4d196492b68d99c6 commit db2123caf8501a6d2fe0a75a4d196492b68d99c6 Author: Matt Joyce Date: Fri Feb 4 11:47:18 2022 +0100 Add _REENT_SIG_FUNC(ptr) =20 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. Diff: --- newlib/libc/include/sys/reent.h | 1 + newlib/libc/reent/reent.c | 4 ++-- newlib/libc/signal/signal.c | 26 +++++++++++++------------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reen= t.h index ef05dd8c9..fa9c6cf82 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -725,6 +725,7 @@ struct _reent #define _REENT_ERRNO(_ptr) ((_ptr)->_errno) #define _REENT_INC(_ptr) ((_ptr)->_inc) #define _REENT_LOCALE(_ptr) ((_ptr)->_locale) +#define _REENT_SIG_FUNC(_ptr) ((_ptr)->_sig_func) #define _REENT_STDIN(_ptr) ((_ptr)->_stdin) #define _REENT_STDOUT(_ptr) ((_ptr)->_stdout) #define _REENT_STDERR(_ptr) ((_ptr)->_stderr) diff --git a/newlib/libc/reent/reent.c b/newlib/libc/reent/reent.c index 2cfec5363..4e9485c7a 100644 --- a/newlib/libc/reent/reent.c +++ b/newlib/libc/reent/reent.c @@ -83,8 +83,8 @@ _reclaim_reent (struct _reent *ptr) /* We should free _sig_func to avoid a memory leak, but how to do it safely considering that a signal may be delivered immediately after the free? - if (ptr->_sig_func) - _free_r (ptr, ptr->_sig_func);*/ + if (_REENT_SIG_FUNC(ptr)) + _free_r (ptr, _REENT_SIG_FUNC(ptr));*/ =20 if (_REENT_CLEANUP(ptr)) { diff --git a/newlib/libc/signal/signal.c b/newlib/libc/signal/signal.c index a249e9f00..3f14b4712 100644 --- a/newlib/libc/signal/signal.c +++ b/newlib/libc/signal/signal.c @@ -93,14 +93,14 @@ _init_signal_r (struct _reent *ptr) { int i; =20 - if (ptr->_sig_func =3D=3D NULL) + if (_REENT_SIG_FUNC(ptr) =3D=3D NULL) { - ptr->_sig_func =3D (_sig_func_ptr *)_malloc_r (ptr, sizeof (_sig_fun= c_ptr) * NSIG); - if (ptr->_sig_func =3D=3D NULL) + _REENT_SIG_FUNC(ptr) =3D (_sig_func_ptr *)_malloc_r (ptr, sizeof (_s= ig_func_ptr) * NSIG); + if (_REENT_SIG_FUNC(ptr) =3D=3D NULL) return -1; =20 for (i =3D 0; i < NSIG; i++) - ptr->_sig_func[i] =3D SIG_DFL; + _REENT_SIG_FUNC(ptr)[i] =3D SIG_DFL; } =20 return 0; @@ -119,11 +119,11 @@ _signal_r (struct _reent *ptr, return SIG_ERR; } =20 - if (ptr->_sig_func =3D=3D NULL && _init_signal_r (ptr) !=3D 0) + if (_REENT_SIG_FUNC(ptr) =3D=3D NULL && _init_signal_r (ptr) !=3D 0) return SIG_ERR; =20 - old_func =3D ptr->_sig_func[sig]; - ptr->_sig_func[sig] =3D func; + old_func =3D _REENT_SIG_FUNC(ptr)[sig]; + _REENT_SIG_FUNC(ptr)[sig] =3D func; =20 return old_func; } @@ -140,10 +140,10 @@ _raise_r (struct _reent *ptr, return -1; } =20 - if (ptr->_sig_func =3D=3D NULL) + if (_REENT_SIG_FUNC(ptr) =3D=3D NULL) func =3D SIG_DFL; else - func =3D ptr->_sig_func[sig]; + func =3D _REENT_SIG_FUNC(ptr)[sig]; =20 if (func =3D=3D SIG_DFL) return _kill_r (ptr, _getpid_r (ptr), sig); @@ -156,7 +156,7 @@ _raise_r (struct _reent *ptr, } else { - ptr->_sig_func[sig] =3D SIG_DFL; + _REENT_SIG_FUNC(ptr)[sig] =3D SIG_DFL; func (sig); return 0; } @@ -173,10 +173,10 @@ __sigtramp_r (struct _reent *ptr, return -1; } =20 - if (ptr->_sig_func =3D=3D NULL && _init_signal_r (ptr) !=3D 0) + if (_REENT_SIG_FUNC(ptr) =3D=3D NULL && _init_signal_r (ptr) !=3D 0) return -1; =20 - func =3D ptr->_sig_func[sig]; + func =3D _REENT_SIG_FUNC(ptr)[sig]; if (func =3D=3D SIG_DFL) return 1; else if (func =3D=3D SIG_ERR) @@ -185,7 +185,7 @@ __sigtramp_r (struct _reent *ptr, return 3; else { - ptr->_sig_func[sig] =3D SIG_DFL; + _REENT_SIG_FUNC(ptr)[sig] =3D SIG_DFL; func (sig); return 0; }