working on threading, scheduler and process improvements, this has a …

…lot of side-effects,for the better hopefully
Meulengracht · Oct 24, 2018 · 65c9d0c · 65c9d0c
1 parent 5c017f0
commit 65c9d0c
Show file tree

Hide file tree

Showing 41 changed files with 1,044 additions and 2,036 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -332,7 +332,9 @@
         "os.h": "c",
         "iospace.h": "c",
         "deviceio.h": "c",
-        "mstring.h": "c"
+        "mstring.h": "c",
+        "assert.h": "c",
+        "memorybuffer.h": "c"
     },
     "git.ignoreLimitWarning": true,
     "terminal.integrated.shell.windows": "C:\\Windows\\sysnative\\bash.exe",

diff --git a/kernel/arch/x86/components/thread.c b/kernel/arch/x86/components/thread.c
@@ -21,13 +21,14 @@
  */
 #define __MODULE "XTIF"
 
+#include <process/process.h>
 #include <system/thread.h>
 #include <system/utils.h>
 #include <threading.h>
-#include <process/phoenix.h>
 #include <interrupts.h>
 #include <thread.h>
 #include <memory.h>
+#include <handle.h>
 #include <debug.h>
 #include <heap.h>
 #include <apic.h>
@@ -122,7 +123,6 @@ OsStatus_t
 ThreadingUnregister(
     _In_ MCoreThread_t *Thread)
 {
-    // Cleanup
     kfree((void*)Thread->Data[THREAD_DATA_MATHBUFFER]);
     return OsSuccess;
 }
@@ -163,9 +163,10 @@ ThreadingYield(void)
  * does not return. */
 OsStatus_t
 ThreadingSignalDispatch(
-    _In_ MCoreThread_t *Thread)
+    _In_ MCoreThread_t* Thread)
 {
-    MCoreAsh_t *Process     = PhoenixGetAsh(Thread->AshId);
+    SystemProcess_t* Process = (SystemProcess_t*)LookupHandle(Thread->ProcessHandle);
+    assert(Process != NULL);
 
     // Now we can enter the signal context 
     // handler, we cannot return from this function

diff --git a/kernel/arch/x86/interrupts/interrupts.c b/kernel/arch/x86/interrupts/interrupts.c
@@ -29,7 +29,7 @@
 #include <system/thread.h>
 #include <system/utils.h>
 #include <ds/collection.h>
-#include <process/phoenix.h>
+#include <process/process.h>
 #include <acpiinterface.h>
 #include <interrupts.h>
 #include <threading.h>
@@ -414,7 +414,7 @@ ExceptionSignal(
 #ifdef __OSCONFIG_DISABLE_SIGNALLING
     if (Signal >= 0) {
 #else
-    if (PhoenixGetCurrentAsh() == NULL) {
+    if (GetCurrentProcess() == NULL) {
 #endif
         return OsError;
     }
@@ -561,7 +561,7 @@ ExceptionEntry(
         }
 
         // Locate which module
-        if (DebugGetModuleByAddress(PhoenixGetCurrentAsh(), CONTEXT_IP(Registers), &Base, &Name) == OsSuccess) {
+        if (DebugGetModuleByAddress(GetCurrentProcess(), CONTEXT_IP(Registers), &Base, &Name) == OsSuccess) {
             uintptr_t Diff = CONTEXT_IP(Registers) - Base;
             WRITELINE("Faulty Address: 0x%x (%s)", Diff, Name);
         }

diff --git a/kernel/debug.c b/kernel/debug.c
@@ -270,7 +270,7 @@ DebugStackTrace(
         uintptr_t Value = StackPtr[0];
         uintptr_t Base  = 0;
         char *Name      = NULL;
-        if (DebugGetModuleByAddress(PhoenixGetCurrentAsh(), Value, &Base, &Name) == OsSuccess) {
+        if (DebugGetModuleByAddress(GetCurrentProcess(), Value, &Base, &Name) == OsSuccess) {
             uintptr_t Diff = Value - Base;
             WRITELINE("%u - 0x%x (%s)", MaxFrames - Itr, Diff, Name);
             Itr--;
@@ -367,7 +367,7 @@ DebugPageFaultFileMappings(
     // Variables
     MCoreAshFileMappingEvent_t *Event   = NULL;
     MCoreAshFileMapping_t *Mapping      = NULL;
-    MCoreAsh_t *Ash                     = PhoenixGetCurrentAsh();
+    MCoreAsh_t *Ash                     = GetCurrentProcess();
 
     if (Ash != NULL) {
         // Iterate file-mappings
@@ -399,7 +399,7 @@ DebugPageFaultProcessHeapMemory(
     _In_ Context_t* Context,
     _In_ uintptr_t  Address)
 {
-    MCoreAsh_t *Ash     = PhoenixGetCurrentAsh();
+    MCoreAsh_t *Ash     = GetCurrentProcess();
     Flags_t PageFlags   = MAPPING_USERSPACE | MAPPING_FIXED;
 
     if (Ash != NULL) {

diff --git a/kernel/events.c b/kernel/events.c
diff --git a/kernel/handle.c b/kernel/handle.c
@@ -28,11 +28,13 @@
 
 // Include all the systems that we have to cleanup
 #include <memorybuffer.h>
+#include <phoenix/process.h>
 
 static Collection_t         Handles                             = COLLECTION_INIT(KeyInteger);
 static _Atomic(UUId_t)      IdGenerator                         = 1;
 static HandleDestructorFn   HandleDestructors[HandleTypeCount]  = {
-    DestroyMemoryBuffer
+    DestroyMemoryBuffer,
+    DestroyProcess
 };
 
 /* CreateHandle

diff --git a/kernel/include/events.h b/kernel/include/events.h
diff --git a/kernel/include/handle.h b/kernel/include/handle.h
@@ -29,6 +29,7 @@
 
 typedef enum _SystemHandleType {
     HandleTypeMemoryBuffer = 0,
+    HandleTypeProcess,
 
     HandleTypeCount
 } SystemHandleType_t;