sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't allow signals to wake up blocked task if the signal is blocked.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@171 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2007-03-29 13:31:08 +00:00
parent 54339607da
commit b765d17818
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sched/sig_received.c
View File

@ -289,8 +289,8 @@ int sig_received(FAR _TCB *stcb, siginfo_t *info)
irqstate_t saved_state;
int ret = ERROR;
dbg("sig_received: TCB=0x%08x signo=%d code=%d value=%d\n",
stcb, info->si_signo, info->si_code, info->si_value.sival_int);
dbg("sig_received: TCB=0x%08x signo=%d code=%d value=%d mask=%08x\n",
stcb, info->si_signo, info->si_code, info->si_value.sival_int, stcb->sigprocmask);
if (stcb && info)
{
@ -363,31 +363,32 @@ int sig_received(FAR _TCB *stcb, siginfo_t *info)
/* If the task neither was waiting for the signal nor had a signal
* handler attached to the signal, then the default action is
* simply to ignore the signal */
}
* simply to ignore the signal
*/
/****** OTHER SIGNAL HANDLING ******/
/****** OTHER SIGNAL HANDLING ******/
/* If the task is blocked waiting for a semaphore, then that
* task must be unblocked when a signal is received.
*/
/* If the task is blocked waiting for a semaphore, then that
* task must be unblocked when a signal is received.
*/
if (stcb->task_state == TSTATE_WAIT_SEM)
{
sem_waitirq(stcb);
}
if (stcb->task_state == TSTATE_WAIT_SEM)
{
sem_waitirq(stcb);
}
/* If the task is blocked waiting on a message queue, then that
* task must be unblocked when a signal is received.
*/
/* If the task is blocked waiting on a message queue, then that
* task must be unblocked when a signal is received.
*/
#ifndef CONFIG_DISABLE_MQUEUE
if (stcb->task_state == TSTATE_WAIT_MQNOTEMPTY ||
stcb->task_state == TSTATE_WAIT_MQNOTFULL)
{
mq_waitirq(stcb);
}
if (stcb->task_state == TSTATE_WAIT_MQNOTEMPTY ||
stcb->task_state == TSTATE_WAIT_MQNOTFULL)
{
mq_waitirq(stcb);
}
#endif
}
}
return ret;