😧

Author: xywanz

kevos/include/arch/x86/x64/process.h

@@ -17,6 +17,7 @@ limitations under the License.
 #define _KEVOS_ARCH_X86_X64_PROCESS_H_
 
 #include <sys/types.h>
+#include <kernel/multitask/process.h>
 #include <arch/x86/x64/vm.h>
 
 #include <list>
@@ -57,20 +58,6 @@ struct ProcessRegisters
     uint32_t fpu[28];
 };
 
-class Process
-{
-public:
-    Process(void* entry,void* stack,uint64_t userProcess);
-
-    ProcessRegisters* registers()
-    {
-        return m_regs;
-    }
-
-private:
-    ProcessRegisters* m_regs;
-};
-
 
 class ProcessManager
 {
@@ -83,7 +70,7 @@ class ProcessManager
 
     static void setInstructionPointer(Process* process,void* entry)
     {
-        process->registers()->rip=(uint64_t)entry;
+        process->getRegisters<ProcessRegisters*>()->rip=(uint64_t)entry;
     }
 
     static void setVirtualMemory(Process* process,const mm::vm::VirtualMemory& mm);

kevos/include/kernel/multitask/process.h

@@ -0,0 +1,57 @@
+/* Copyright 2018 kevin Lau (http://github.com/stormycatcat)
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef _KEVOS_KERNEL_MULTITASK_PROCESS_H_
+#define _KEVOS_KERNEL_MULTITASK_PROCESS_H_
+
+#include <sys/types.h>
+
+namespace multitask
+{
+
+inline pid_t generateNextPid()
+{
+    static pid_t cache=0;
+    return cache++;
+}
+
+class Process
+{
+public:
+    enum TYPE{KERNEL,USER};
+    enum STATE{RUNNING,WAITING,DEAD,READY};
+
+    Process(void* entry,void* stack,bool userProcess);
+
+    template<class T>
+    T getRegisters()
+    {
+        return (T)regs;
+    }
+
+    void setState(STATE s){state=s;}
+
+private:
+    pid_t pid;
+    TYPE type;
+    STATE state;
+    void* regs;
+    void* entry;
+    void* stack;
+};
+
+}   // end of namespace kernel
+
+#endif

kevos/include/kernel/scheduler.h kevos/include/kernel/multitask/scheduler.h

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef _KEVOS_KERNEL_SCHEDULER_H_
-#define _KEVOS_KERNEL_SCHEDULER_H_
+#ifndef _KEVOS_KERNEL_MULTITASK_SCHEDULER_H_
+#define _KEVOS_KERNEL_MULTITASK_SCHEDULER_H_
 
 #include <sys/types.h>
 

kevos/include/kernel/process.h kevos/include/kernel/multitask/spinlock.h

@@ -13,22 +13,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef _KEVOS_KERNEL_PROCESS_H_
-#define _KEVOS_KERNEL_PROCESS_H_
+#ifndef _KEVOS_KERNEL_MULTITASK_SPINLOCK_H_
+#define _KEVOS_KERNEL_MULTITASK_SPINLOCK_H_
 
-#include <sys/types.h>
-
-namespace multitask
+namespace multitask::lock
 {
 
-class Process
+class SpinLock
 {
 public:
-    enum TYPE{KERNEL,USER};
-private:
-
+    
 };
 
-}   // end of namespace kernel
+}
 
 #endif

kevos/include/sys/types.h

@@ -23,4 +23,8 @@ limitations under the License.
     #include <arch/x86/x64/types.h>
 #endif
 
+#include <cstddef>
+
+using pid_t=std::size_t;
+
 #endif

kevos/src/arch/x86/x64/interrupt.cpp

@@ -23,7 +23,7 @@ limitations under the License.
 
 void saveProcessRegisters(char* base)
 {
-    auto regs=multitask::ProcessManager::current()->registers();
+    auto regs=multitask::ProcessManager::current()->getRegisters<multitask::ProcessRegisters*>();
     auto ssregs=reinterpret_cast<intr::SoftwareSavedRegisters*>(base);
     regs->rax=ssregs->rax;
     regs->rbx=ssregs->rbx;
@@ -52,7 +52,7 @@ void saveProcessRegisters(char* base)
 
 void switchToContext()
 {
-    auto regs=multitask::ProcessManager::current()->registers();
+    auto regs=multitask::ProcessManager::current()->getRegisters<multitask::ProcessRegisters*>();
     // TSS::tss.rsp0=regs->rsp;
     __asm__ ("movq %[cr3],%%cr3" : : [cr3]"r"(regs->cr3));
     __asm__ ("pushq %[ss]" : : [ss]"m"(regs->ss));

kevos/src/arch/x86/x64/process.cpp

@@ -25,12 +25,13 @@ limitations under the License.
 namespace multitask
 {
 
-Process::Process(void* entry,void* stack,uint64_t userProcess)
+Process::Process(void* entry,void* stack,bool userProcess)
 {
     if(userProcess)
-        m_regs=ProcessManager::createUserRegInfo(entry,stack,0);
+        regs=(void*)ProcessManager::createUserRegInfo(entry,stack,0);
     else
-        m_regs=ProcessManager::createKernelRegInfo(entry,stack);
+        regs=(void*)ProcessManager::createKernelRegInfo(entry,stack);
+    pid=generateNextPid();
 }
 
 std::list<Process*> ProcessManager::s_processes(nullptr);

kevos/src/kernel/scheduler.cpp kevos/src/kernel/multitask/scheduler.cpp

@@ -13,6 +13,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include <kernel/scheduler.h>
+#include <kernel/multitask/scheduler.h>