Only kill process if main thread

Author: fido2020

Kernel/include/TTY/PTY.h

@@ -45,7 +45,7 @@ class PTMultiplexor final : public Device {
 
     PTMultiplexor();
 
-    lock_t m_ptmxLock;
+    lock_t m_ptmxLock = 0;
     int m_nextPT = 0; // PTYs are named /dev/pts/0, 1, 2, ... 
 
     PTS m_pts;

Kernel/src/Arch/x86_64/IDT.cpp

@@ -259,7 +259,12 @@ extern "C" void isr_handler(int intNum, RegisterContext* regs) {
             ;
     } else {
         int res = acquireTestLock(&Scheduler::GetCurrentThread()->kernelLock);
-        assert(!res); // Make sure we acquired the lock
+        if(res) { // Make sure we acquired the lock
+            assert(Process::Current()->State() != Process::Process_Running);
+            for(;;) {
+                Scheduler::Yield();
+            }
+        }
 
         Process* current = Process::Current();
 

Kernel/src/Arch/x86_64/Paging.cpp

@@ -683,6 +683,7 @@ void MapVirtualMemory4K(uint64_t phys, uint64_t virt, uint64_t amount, uint64_t
             CreatePageTable(pdptIndex, pageDirIndex,
                             pageMap); // If we don't have a page table at this address, create one.
 
+        assert(pageMap->pageTables[pdptIndex][pageDirIndex]);
         pageMap->pageTables[pdptIndex][pageDirIndex][pageIndex] = flags;
         SetPageFrame(&(pageMap->pageTables[pdptIndex][pageDirIndex][pageIndex]), phys);
 

Kernel/src/Objects/Process.cpp

@@ -303,9 +303,19 @@ void Process::Die() {
 
     CPU* cpu = GetCPULocal();
 
-    if(m_state == Process_Dying) {
-        // Process is already dying, we might be another thread
-        releaseLock(&Thread::Current()->kernelLock);
+    // Check if we are main thread
+    if(cpu->currentThread != cpu->currentThread->parent->GetMainThread().get()) {
+        acquireLock(&m_processLock);
+        if(m_state != Process_Dying) {
+            // Kill the main thread
+            cpu->currentThread->parent->GetMainThread()->Signal(SIGKILL);
+        }
+
+        asm volatile("cli");
+        releaseLock(&m_processLock);
+        releaseLock(&cpu->currentThread->kernelLock);
+        cpu->currentThread->state = ThreadStateDying;
+        asm volatile("sti");
         for(;;) Scheduler::Yield();
     }