From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dedi548.your-server.de (dedi548.your-server.de [85.10.215.148]) by sourceware.org (Postfix) with ESMTPS id 3C46D3857BA2 for ; Tue, 21 Jun 2022 12:49:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3C46D3857BA2 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embedded-brains.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embedded-brains.de Received: from sslproxy02.your-server.de ([78.47.166.47]) by dedi548.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1o3dK5-0003ZV-Ou for newlib@sourceware.org; Tue, 21 Jun 2022 14:49:38 +0200 Received: from [82.100.198.138] (helo=mail.embedded-brains.de) by sslproxy02.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o3dK5-000M6U-VQ for newlib@sourceware.org; Tue, 21 Jun 2022 14:49:37 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id B1D6348005A for ; Tue, 21 Jun 2022 14:49:37 +0200 (CEST) Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 4SLtlR90_YvP for ; Tue, 21 Jun 2022 14:49:37 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id F13EA480140 for ; Tue, 21 Jun 2022 14:49:34 +0200 (CEST) X-Virus-Scanned: amavisd-new at zimbra.eb.localhost Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id KGt_gfcFkzZe for ; Tue, 21 Jun 2022 14:49:34 +0200 (CEST) Received: from zimbra.eb.localhost (unknown [192.168.96.242]) by mail.embedded-brains.de (Postfix) with ESMTPSA id CA2B34801DF for ; Tue, 21 Jun 2022 14:49:34 +0200 (CEST) From: Sebastian Huber To: newlib@sourceware.org Subject: [PATCH 12/14] Add _REENT_SIG_FUNC(ptr) Date: Tue, 21 Jun 2022 14:49:29 +0200 Message-Id: <20220621124931.36450-13-sebastian.huber@embedded-brains.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220621124931.36450-1-sebastian.huber@embedded-brains.de> References: <20220621124931.36450-1-sebastian.huber@embedded-brains.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authenticated-Sender: smtp-embedded@poldinet.de X-Virus-Scanned: Clear (ClamAV 0.103.6/26579/Tue Jun 21 10:15:30 2022) X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2022 12:49:40 -0000 From: Matt Joyce 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. --- 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/re= ent.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_f= unc_ptr) * NSIG); - if (ptr->_sig_func =3D=3D NULL) + _REENT_SIG_FUNC(ptr) =3D (_sig_func_ptr *)_malloc_r (ptr, sizeof (= _sig_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; } --=20 2.35.3