berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

shutdown bugfix

This commit is contained in:
nakst 2021-11-14 18:25:53 +00:00
parent 83ea7cc2af
commit f4f69ea9c8
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/scheduler.cpp
View File

@ -167,6 +167,7 @@ struct Process {
// Termination: // Termination:
bool allThreadsTerminated; bool allThreadsTerminated;
bool blockShutdown;
bool preventNewThreads; // Set by ProcessTerminate. bool preventNewThreads; // Set by ProcessTerminate.
int exitStatus; // TODO Remove this. int exitStatus; // TODO Remove this.
KEvent killedEvent; KEvent killedEvent;
@ -824,7 +825,12 @@ bool ProcessStartWithNode(Process *process, KNode *node) {
KernelPanic("ProcessStartWithNode - Could not open read handle to node %x.\n", node); KernelPanic("ProcessStartWithNode - Could not open read handle to node %x.\n", node);
} }
if (KEventPoll(&scheduler.allProcessesTerminatedEvent)) {
KernelPanic("ProcessStartWithNode - allProcessesTerminatedEvent was set.\n");
}
process->executableNode = node; process->executableNode = node;
process->blockShutdown = true;
__sync_fetch_and_add(&scheduler.activeProcessCount, 1); __sync_fetch_and_add(&scheduler.activeProcessCount, 1);
__sync_fetch_and_add(&scheduler.blockShutdownProcessCount, 1); __sync_fetch_and_add(&scheduler.blockShutdownProcessCount, 1);
@ -968,13 +974,16 @@ void ProcessRemove(Process *process) {
// This is done after closing all handles, since closing handles can generate messages. // This is done after closing all handles, since closing handles can generate messages.
process->messageQueue.messages.Free(); process->messageQueue.messages.Free();
if (process->blockShutdown) {
if (1 == __sync_fetch_and_sub(&scheduler.blockShutdownProcessCount, 1)) {
// If this is the last process to exit, set the allProcessesTerminatedEvent.
KEventSet(&scheduler.allProcessesTerminatedEvent);
}
}
// Free the process. // Free the process.
MMSpaceCloseReference(process->vmm); MMSpaceCloseReference(process->vmm);
scheduler.processPool.Remove(process); scheduler.processPool.Remove(process);
if (1 == __sync_fetch_and_sub(&scheduler.blockShutdownProcessCount, 1)) {
KEventSet(&scheduler.allProcessesTerminatedEvent);
}
} }
void ThreadRemove(Thread *thread) { void ThreadRemove(Thread *thread) {