p71924506
/
kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!574 fix: solve SIGCHLD ignored in sigsuspend() 

Merge pull request !574 from MGY917/sigsuspend
This commit is contained in:
openharmony_ci 2021-09-08 08:27:12 +00:00 committed by Gitee
parent 597ced7948 5a80d4e1a3
commit e095e87682
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/base/ipc/los_signal.c
View File

@ -575,9 +575,21 @@ int OsSigSuspend(const sigset_t *set)
/* If pending mask not in sigmask, need set sigflag */ /* If pending mask not in sigmask, need set sigflag */
OsSigMaskSwitch(rtcb, *set); OsSigMaskSwitch(rtcb, *set);
ret = OsSigTimedWaitNoLock(&setSuspend, NULL, LOS_WAIT_FOREVER);
if (ret < 0) { if (rtcb->sig.sigFlag > 0) {
PRINT_ERR("FUNC %s LINE = %d, ret = %x\n", __FUNCTION__, __LINE__, ret); SCHEDULER_UNLOCK(intSave);
/*
* If rtcb->sig.sigFlag > 0, it means that some signal have been
* received, and we need to do schedule to handle the signal directly.
*/
LOS_Schedule();
return -EINTR;
} else {
ret = OsSigTimedWaitNoLock(&setSuspend, NULL, LOS_WAIT_FOREVER);
if (ret < 0) {
PRINT_ERR("FUNC %s LINE = %d, ret = %x\n", __FUNCTION__, __LINE__, ret);
}
} }
SCHEDULER_UNLOCK(intSave); SCHEDULER_UNLOCK(intSave);