yystopf
/
openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!723 用户态进程主线程退出时，其他子线程刚好进入异常处理流程会导致系统卡死 

Merge pull request !723 from zhangfanfan2/master
This commit is contained in:
openharmony_ci 2021-12-03 02:37:54 +00:00 committed by Gitee
parent c8c07261ca d955790a44
commit 30d5badbce
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/arm/src/los_exc.c
View File

@ -563,7 +563,6 @@ STATIC VOID OsUserExcHandle(ExcContext *excBufAddr)
#else #else
g_currHandleExcCpuID = INVALID_CPUID; g_currHandleExcCpuID = INVALID_CPUID;
#endif #endif
runProcess->processStatus &= ~OS_PROCESS_FLAG_EXIT;
#ifdef LOSCFG_KERNEL_SMP #ifdef LOSCFG_KERNEL_SMP
#ifdef LOSCFG_FS_VFS #ifdef LOSCFG_FS_VFS
@ -580,10 +579,10 @@ STATIC VOID OsUserExcHandle(ExcContext *excBufAddr)
#endif #endif
OsProcessExitCodeSignalSet(runProcess, SIGUSR2); OsProcessExitCodeSignalSet(runProcess, SIGUSR2);
/* An exception was raised by a task that is not the current main thread during the exit process of /* An exception was raised by a task during the exit process of
* the current process. * the current process.
*/ */
if ((runProcess->processStatus & OS_PROCESS_FLAG_EXIT) && (runProcess->threadGroupID != runTask->taskID)) { if (runProcess->processStatus & OS_PROCESS_FLAG_EXIT) {
SCHEDULER_UNLOCK(intSave); SCHEDULER_UNLOCK(intSave);
/* Exception handling All operations should be kept prior to that operation */ /* Exception handling All operations should be kept prior to that operation */
OsExcRestore(); OsExcRestore();