nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Add sigset()

Browse source
This commit is contained in:
Gregory Nutt 2015-04-09 10:16:35 -06:00
parent 2aa80e06f5
commit 81703e6fad
4 changed files with 288 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

171
Documentation/NuttxUserGuide.html
View file

@ -13,7 +13,7 @@
<h1><big><font color="#3c34ec"><i>NuttX Operating System<p>User's Manual</i></font></big></h1> <h1><big><font color="#3c34ec"><i>NuttX Operating System<p>User's Manual</i></font></big></h1>
<p><small>by</small></p> <p><small>by</small></p>
<p>Gregory Nutt<p> <p>Gregory Nutt<p>
<p>Last Updated: November 29, 2014</p> <p>Last Updated: April 9, 2015</p>
</td> </td>
</tr> </tr>
</table> </table>
@ -4487,14 +4487,19 @@ interface of the same name.
<li><a href="#sigdelset">2.7.4 sigdelset</a></li> <li><a href="#sigdelset">2.7.4 sigdelset</a></li>
<li><a href="#sigismember">2.7.5 sigismember</a></li> <li><a href="#sigismember">2.7.5 sigismember</a></li>
<li><a href="#sigaction">2.7.6 sigaction</a></li> <li><a href="#sigaction">2.7.6 sigaction</a></li>
<li><a href="#sigprocmask">2.7.7 sigprocmask</a></li> <li><a href="#sigignore">2.7.7 sigignore</a></li>
<li><a href="#sigpending">2.7.8 sigpending</a></li> <li><a href="#sigset">2.7.8 sigset</a></li>
<li><a href="#sigsuspend">2.7.9 sigsuspend</a></li> <li><a href="#sigprocmask">2.7.9 sigprocmask</a></li>
<li><a href="#sigwaitinfo">2.7.10 sigwaitinfo</a></li> <li><a href="#sighold">2.7.10 sighold</a></li>
<li><a href="#sigtimedwait">2.7.11 sigtimedwait</a></li> <li><a href="#sigrelse">2.7.11 sigrelse</a></li>
<li><a href="#sigqueue">2.7.12 sigqueue</a></li> <li><a href="#sigpending">2.7.12 sigpending</a></li>
<li><a href="#kill">2.7.13 kill</a></li> <li><a href="#sigsuspend">2.7.13 sigsuspend</a></li>
<li><a href="#pause">2.7.14 pause</a></li> <li><a href="#sigpause">2.7.14 sigpause</a></li>
<li><a href="#sigwaitinfo">2.7.15 sigwaitinfo</a></li>
<li><a href="#sigtimedwait">2.7.16 sigtimedwait</a></li>
<li><a href="#sigqueue">2.7.17 sigqueue</a></li>
<li><a href="#kill">2.7.18 kill</a></li>
<li><a href="#pause">2.7.19 pause</a></li>
</ul> </ul>
<H3><a name="sigemptyset">2.7.1 sigemptyset</a></H3> <H3><a name="sigemptyset">2.7.1 sigemptyset</a></H3>
@ -4729,7 +4734,65 @@ Differences from the POSIX implementation include:
</li> </li>
</ul> </ul>
<H3><a name="sigprocmask">2.7.7 sigprocmask</a></H3> <H3><a name="sigignore">2.7.7 sigignore</a></H3>
<p>
<b>Function Prototype:</b>
<pre>
#include &lt;signal.h&gt;
int sigignore(int signo);
</pre>
<p>
<b>Description:</b> The sigignore() function will set the disposition of <code>signo</code> to <code>SIG_IGN</code>.
<p>
<b>Input Parameters:</b>
<ul>
<li><code>signo</code>. The signal number to act on
</ul>
<p>
<b>Returned Value:</b>
<ul>
<li>Zero is returned upon successful completion, otherwise -1 (<code>ERROR</code>) is returned with the <code<>errno</code> set appropriately. The <code>errno</code> value of <code>EINVAL</code>, for example, would indicate that <code>signo</code> argument is not a valid signal number.
</ul>
<H3><a name="sigset">2.7.8 sigset</a></H3>
<p>
<b>Function Prototype:</b>
<pre>
#include &lt;signal.h&gt;
void (*sigset(int signo, void (*disp)(int)))(int);
</pre>
<p>
<b>Description:</b>
The sigset() function will modify signal dispositions.
The <code>signo</code> argument specifies the signal.
The <code>disp</code> argument specifies the signal's disposition, which may be <code>SIG_DFL</code>, <code>SIG_IGN</code>, or the address of a signal handler.
If <code>disp</code> is the address of a signal handler, the system will add <code>signo</code> to the calling process' signal mask before executing the signal handler; when the signal handler returns, the system will restore the calling process' signal mask to its state prior to the delivery of the signal.
<code>signo</code> will be removed from the calling process' signal mask.
</p>
<p>
NOTE: The value <code>SIG_HOLD</code> for <code>disp</code> is not currently supported.
</p>
<p>
<b>Input Parameters:</b>
<ul>
<li><code>signo</code>. The signal number to operate on
<li><code>disp</code>. The new disposition of the signal
</ul>
<p>
<b>Returned Value:</b>
<ul>
<li>
Upon successful completion, <code>sigset()</code> will the previous disposition of the signal.
Otherwise, <code>SIG_ERR</code> will be returned and <code>errno</code> set to indicate the error.
</ul>
<H3><a name="sigprocmask">2.7.9 sigprocmask</a></H3>
<p> <p>
<b>Function Prototype:</b> <b>Function Prototype:</b>
@ -4779,7 +4842,55 @@ pointed to by the <code>set</code> input parameter.
<b> POSIX Compatibility:</b> Comparable to the POSIX <b> POSIX Compatibility:</b> Comparable to the POSIX
interface of the same name. interface of the same name.
<H3><a name="sigpending">2.7.8 sigpending</a></H3> <H3><a name="sighold">2.7.10 sighold</a></H3>
<p>
<b>Function Prototype:</b>
<pre>
#include &lt;signal.h&gt;
int sighold(int signo);
</pre>
<p>
<b>Description:</b> The sighold() function will add <code>signo</code> to the calling process' signal mask
</p>
<p>
<b>Input Parameters:</b>
<ul>
<li><code>signo</code>. Identifies the signal to be blocked.
</ul>
<p>
<b>Returned Value:</b>
<ul>
<li>Zero is returned upon successful completion, otherwise -1 (<code>ERROR</code>) is returned with the <code<>errno</code> set appropriately. The <code>errno</code> value of <code>EINVAL</code>, for example, would indicate that <code>signo</code> argument is not a valid signal number.
</ul>
<H3><a name="sigrelse">2.7.11 sigrelse</a></H3>
<p>
<b>Function Prototype:</b>
<pre>
#include &lt;signal.h&gt;
int sigrelse(int signo);
</pre>
<p>
<b>Description:</b> The sighold() function will remove <code>signo</code> from the calling process' signal mask
</p>
<p>
<b>Input Parameters:</b>
<ul>
<li><code>signo</code>. Identifies the signal to be unblocked.
</ul>
<p>
<b>Returned Value:</b>
<ul>
<li>Zero is returned upon successful completion, otherwise -1 (<code>ERROR</code>) is returned with the <code<>errno</code> set appropriately. The <code>errno</code> value of <code>EINVAL</code>, for example, would indicate that <code>signo</code> argument is not a valid signal number.
</ul>
<H3><a name="sigpending">2.7.12 sigpending</a></H3>
<p> <p>
<b>Function Prototype:</b> <b>Function Prototype:</b>
@ -4817,7 +4928,7 @@ is delivered more than once.&quot;
<b> POSIX Compatibility:</b> Comparable to the POSIX <b> POSIX Compatibility:</b> Comparable to the POSIX
interface of the same name. interface of the same name.
<H3><a name="sigsuspend">2.7.9 sigsuspend</a></H3> <H3><a name="sigsuspend">2.7.13 sigsuspend</a></H3>
<p> <p>
<b>Function Prototype:</b> <b>Function Prototype:</b>
@ -4865,7 +4976,30 @@ function or to terminate the task.&quot; Only delivery of the signal
is required in the present implementation (even if the signal is ignored). is required in the present implementation (even if the signal is ignored).
</ul> </ul>
<H3><a name="sigwaitinfo">2.7.10 sigwaitinfo</a></H3> <H3><a name="sigpause">2.7.14 sigpause</a></H3>
<p>
<b>Function Prototype:</b>
<pre>
#include &lt;signal.h&gt;
int sigpause(int signo);
</pre>
<p>
<b>Description:</b> The <code>sigpause()</code>) function will remove <code>signo</code>) from the calling process' signal mask and suspend the calling process until a signal is received.
The <code>sigpause()</code>) function will restore the process' signal mask to its original state before returning.
<p>
<b>Input Parameters:</b>
<ul>
<li><code>set</code>. Identifies the signal to be unblocked while waiting.
</ul>
<p>
<b>Returned Value:</b>
<ul>
<li><code>sigpause</code> always returns -1 (<code>ERROR</code>). On a successful wait for a signal, the <code>errno</code> will be set to <code>EINTR</code>.
</ul>
<H3><a name="sigwaitinfo">2.7.15 sigwaitinfo</a></H3>
<p> <p>
<b>Function Prototype:</b> <b>Function Prototype:</b>
@ -4894,10 +5028,9 @@ with a NULL timeout parameter. (see below).
<p> <p>
<b>Assumptions/Limitations:</b> <b>Assumptions/Limitations:</b>
<p> <p>
<b> POSIX Compatibility:</b> Comparable to the POSIX <b> POSIX Compatibility:</b> Comparable to the POSIX interface of the same name.
interface of the same name.
<H3><a name="sigtimedwait">2.7.11 sigtimedwait</a></H3> <H3><a name="sigtimedwait">2.7.16 sigtimedwait</a></H3>
<p> <p>
<b>Function Prototype:</b> <b>Function Prototype:</b>
@ -4963,7 +5096,7 @@ that the unblocked signal be caught; the task will be resumed even if
the unblocked signal is ignored. the unblocked signal is ignored.
</ul> </ul>
<H3><a name="sigqueue">2.7.12 sigqueue</a></H3> <H3><a name="sigqueue">2.7.17 sigqueue</a></H3>
<p> <p>
<b>Function Prototype:</b> <b>Function Prototype:</b>
@ -5020,7 +5153,7 @@ There is no null signal in the present implementation; a zero signal will
be sent. be sent.
</ul> </ul>
<H3><a name="kill">2.7.13 kill</a></H3> <H3><a name="kill">2.7.18 kill</a></H3>
<p> <p>
<b>Function Prototype:</b> <b>Function Prototype:</b>
@ -5076,7 +5209,7 @@ be sent.
<li>Sending of signals to 'process groups' is not supported in NuttX.</li> <li>Sending of signals to 'process groups' is not supported in NuttX.</li>
</ul> </ul>
<H3><a name="pause">2.7.14 pause</a></H3> <H3><a name="pause">2.7.19 pause</a></H3>
<p> <p>
<b>Function Prototype:</b> <b>Function Prototype:</b>

9
include/signal.h
View file

@ -165,11 +165,17 @@
#define SIGEV_NONE 0 /* No notification desired */ #define SIGEV_NONE 0 /* No notification desired */
#define SIGEV_SIGNAL 1 /* Notify via signal */ #define SIGEV_SIGNAL 1 /* Notify via signal */
/* Special values of sigaction (all treated like NULL) */ /* Special values of of sa_handler used by sigaction and sigset. There are all
* treated like NULL for now.
*
* REVISIT: Need to distinguish the value of SIG_HOLD. It is need in the
* implementation of sigset().
*/
#define SIG_ERR ((CODE void*)-1) #define SIG_ERR ((CODE void*)-1)
#define SIG_DFL ((CODE void*)0) #define SIG_DFL ((CODE void*)0)
#define SIG_IGN ((CODE void*)0) #define SIG_IGN ((CODE void*)0)
#define SIG_HOLD ((CODE void*)0)
/******************************************************************************** /********************************************************************************
* Global Type Declarations * Global Type Declarations
@ -262,6 +268,7 @@ int sigdelset(FAR sigset_t *set, int signo);
int sigismember(FAR const sigset_t *set, int signo); int sigismember(FAR const sigset_t *set, int signo);
int sigaction(int sig, FAR const struct sigaction *act, int sigaction(int sig, FAR const struct sigaction *act,
FAR struct sigaction *oact); FAR struct sigaction *oact);
void (*sigset(int signo, void (*disp)(int)))(int);
int sigignore(int signo); int sigignore(int signo);
int sigprocmask(int how, FAR const sigset_t *set, FAR sigset_t *oset); int sigprocmask(int how, FAR const sigset_t *set, FAR sigset_t *oset);
int sigpause(int signo); int sigpause(int signo);

1
libc/signal/Make.defs
View file

@ -39,6 +39,7 @@ ifneq ($(CONFIG_DISABLE_SIGNALS),y)
CSRCS += sig_emptyset.c sig_fillset.c sig_addset.c sig_delset.c CSRCS += sig_emptyset.c sig_fillset.c sig_addset.c sig_delset.c
CSRCS += sig_ismember.c sig_hold.c sig_relse.c sig_ignore.c sig_pause.c CSRCS += sig_ismember.c sig_hold.c sig_relse.c sig_ignore.c sig_pause.c
CSRCS += sig_set.c
# Add the signal directory to the build # Add the signal directory to the build

127
libc/signal/sig_set.c Normal file
View file

@ -0,0 +1,127 @@
/****************************************************************************
* libc/signal/sig_set.c
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <signal.h>
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: sigset
*
* Description:
* The sigset() function will modify signal dispositions. The 'signo'
* argument specifies the signal. The 'disp' argument specifies the
* signal's disposition, which may be SIG_DFL, SIG_IGN, or the address
* of a signal handler. If 'disp' is the address of a signal handler, the
* system will add 'signo' to the calling process' signal mask before
* executing the signal handler; when the signal handler returns, the
* system will restore the calling process' signal mask to its state prior
* to the delivery of the signal. 'signo' will be removed from the calling
* process' signal mask.
*
* NOTE: The value SIG_HOLD for 'disp' is not supported. It should work
* like this: If 'disp' is equal to SIG_HOLD, 'signo' will be added to,
* not removed from, the calling process' signal mask and 'signo''s
* disposition will remain unchanged.
*
* Input Parameters:
* signo - Identifies the signal to operate on
* disp - The new disposition of the signal
*
* Returned Value:
* Upon successful completion, sigset() will the previous disposition of
* the signal. Otherwise, SIG_ERR will be returned and errno set to
* indicate the error.
*
* NOTE: sigset() would return SIG_HOLD if the signal had been blocked and
* the signal's previous disposition if it had not been blocked.
*
****************************************************************************/
void (*sigset(int signo, void (*disp)(int)))(int)
{
struct sigaction act;
struct sigaction oact;
int ret;
/* Initialize the sigaction structure */
act.sa_handler = disp;
act.sa_flags = 0;
(void)sigemptyset(&act.sa_mask);
/* Check for SIG_IGN and SIG_DFL (and someday SIG_HOLD)
*
* REVISIT: Currently SIG_IGN, SIG_DFL, and SIG_HOLD have the same value
* and cannot be distinguished.
*/
if (disp != SIG_DFL /* && disp != SIG_IGN */)
{
/* Add the signal to the set of signals to be ignored with the signal
* handler executes.
*/
ret = sigaddset(&act.sa_mask, signo);
if (ret < 0)
{
/* Would happen if signo were invalid */
return SIG_ERR;
}
}
/* Set the signal disposition */
ret = sigaction(signo, &act, &oact);
/* Upon successful completion, sigset() will the signal's previous
* disposition. Otherwise, SIG_ERR will be returned and errno set to
* indicate the error.
*/
if (ret == OK)
{
return oact.sa_handler;
}
return SIG_ERR;
}