openharmony/startup_appspawn
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_appspawn synced 2024-12-04 05:14:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1217 fix nwebspawn bug

Browse Source 
Merge pull request !1217 from nianyuu/OpenHarmony-5.0-Beta1
This commit is contained in:
openharmony_ci 2024-06-14 10:45:35 +00:00 committed by Gitee
commit 099e0eb8dc
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
standard/appspawn_appmgr.c
View File

@ -158,6 +158,7 @@ void TerminateSpawnedProcess(AppSpawnedProcess *node)
APPSPAWN_CHECK_ONLY_EXPER(g_appSpawnMgr != NULL && node != NULL, return);
// delete node
OH_ListRemove(&node->node);
OH_ListInit(&node->node);
if (!IsNWebSpawnMode(g_appSpawnMgr)) {
free(node);
return;
@ -165,11 +166,11 @@ void TerminateSpawnedProcess(AppSpawnedProcess *node)
if (g_appSpawnMgr->diedAppCount >= MAX_DIED_PROCESS_COUNT) {
AppSpawnedProcess *oldApp = ListEntry(g_appSpawnMgr->diedQueue.next, AppSpawnedProcess, node);
OH_ListRemove(&oldApp->node);
OH_ListInit(&oldApp->node);
free(oldApp);
g_appSpawnMgr->diedAppCount--;
}
APPSPAWN_LOGI("ProcessAppDied %{public}s, pid=%{public}d", node->name, node->pid);
OH_ListInit(&node->node);
OH_ListAddTail(&g_appSpawnMgr->diedQueue, &node->node);
g_appSpawnMgr->diedAppCount++;
}
@ -226,7 +227,11 @@ static int GetProcessTerminationStatus(pid_t pid)
AppSpawnedProcess *info = ListEntry(node, AppSpawnedProcess, node);
exitStatus = info->exitStatus;
OH_ListRemove(node);
OH_ListInit(node);
free(info);
if (g_appSpawnMgr->diedAppCount > 0) {
g_appSpawnMgr->diedAppCount--;
}
return exitStatus;
}
AppSpawnedProcess *app = GetSpawnedProcess(pid);
@ -237,6 +242,7 @@ static int GetProcessTerminationStatus(pid_t pid)
if (KillAndWaitStatus(pid, SIGKILL, &exitStatus) == 0) { // kill success, delete app
OH_ListRemove(&app->node);
OH_ListInit(&app->node);
free(app);
}
return exitStatus;