Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-28 15:34:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added IPC for processes

Browse Source
This commit is contained in:
Alex 2022-10-27 03:06:43 +03:00
parent 7abfd16ace
commit 9d6a4f530a
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tasking/InterProcessCommunication.cpp
View File

@ -53,6 +53,7 @@ namespace InterProcessCommunication
IPC::IPC() IPC::IPC()
{ {
trace("Starting IPC Service...");
TaskManager->CreateThread(TaskManager->GetCurrentProcess(), (Tasking::IP)IPCServiceStub); TaskManager->CreateThread(TaskManager->GetCurrentProcess(), (Tasking::IP)IPCServiceStub);
TaskManager->GetCurrentThread()->Rename("IPC Service"); TaskManager->GetCurrentThread()->Rename("IPC Service");
} }

19
Tasking/Task.cpp
View File

@ -22,6 +22,7 @@
#endif #endif
NewLock(TaskingLock); NewLock(TaskingLock);
NewLock(TaskingGetCurrentLock);
namespace Tasking namespace Tasking
{ {
@ -357,13 +358,13 @@ namespace Tasking
PCB *Task::GetCurrentProcess() PCB *Task::GetCurrentProcess()
{ {
SmartCriticalSection(TaskingLock); SmartCriticalSection(TaskingGetCurrentLock);
return GetCurrentCPU()->CurrentProcess; return GetCurrentCPU()->CurrentProcess;
} }
TCB *Task::GetCurrentThread() TCB *Task::GetCurrentThread()
{ {
SmartCriticalSection(TaskingLock); SmartCriticalSection(TaskingGetCurrentLock);
return GetCurrentCPU()->CurrentThread; return GetCurrentCPU()->CurrentThread;
} }
@ -447,7 +448,7 @@ namespace Tasking
} }
Thread->Security.TrustLevel = Parent->Security.TrustLevel; Thread->Security.TrustLevel = Parent->Security.TrustLevel;
Thread->Security.UniqueToken = SecurityManager.CreateToken(); // Thread->Security.UniqueToken = SecurityManager.CreateToken();
Thread->Info.SpawnTime = 0; Thread->Info.SpawnTime = 0;
Thread->Info.UsedTime = 0; Thread->Info.UsedTime = 0;
@ -468,6 +469,9 @@ namespace Tasking
Thread->Info.Priority = 0; Thread->Info.Priority = 0;
Thread->Info.Architecture = Architecture; Thread->Info.Architecture = Architecture;
Thread->Info.Compatibility = Compatibility; Thread->Info.Compatibility = Compatibility;
debug("Created thread %d(%s) in process %d(%s)", Thread->ID, Thread->Name, Thread->Parent->ID, Thread->Parent->Name);
Parent->Threads.push_back(Thread); Parent->Threads.push_back(Thread);
return Thread; return Thread;
} }
@ -488,7 +492,7 @@ namespace Tasking
Process->Status = TaskStatus::Ready; Process->Status = TaskStatus::Ready;
Process->Security.TrustLevel = TrustLevel; Process->Security.TrustLevel = TrustLevel;
Process->Security.UniqueToken = SecurityManager.CreateToken(); // Process->Security.UniqueToken = SecurityManager.CreateToken();
Process->IPCHandles = new HashMap<InterProcessCommunication::IPCPort, uint64_t>; Process->IPCHandles = new HashMap<InterProcessCommunication::IPCPort, uint64_t>;
@ -549,6 +553,8 @@ namespace Tasking
} }
Process->Info.Priority = 0; Process->Info.Priority = 0;
debug("Created process %d(%s) in process %d(%s)", Process->ID, Process->Name, Process->Parent->ID, Process->Parent->Name);
Parent->Children.push_back(Process); Parent->Children.push_back(Process);
ListProcess.push_back(Process); ListProcess.push_back(Process);
return Process; return Process;
@ -575,7 +581,7 @@ namespace Tasking
TCB *kthrd = CreateThread(kproc, EntryPoint, 0, Arch); TCB *kthrd = CreateThread(kproc, EntryPoint, 0, Arch);
kthrd->Rename("Main Thread"); kthrd->Rename("Main Thread");
debug("Created Kernel Process: %s and Thread: %s", kproc->Name, kthrd->Name); debug("Created Kernel Process: %s and Thread: %s", kproc->Name, kthrd->Name);
TaskingLock.Lock(); TaskingLock.Lock(__FUNCTION__);
#if defined(__amd64__) || defined(__i386__) #if defined(__amd64__) || defined(__i386__)
uint32_t rax, rbx, rcx, rdx; uint32_t rax, rbx, rcx, rdx;
@ -598,6 +604,9 @@ namespace Tasking
} }
// ((APIC::Timer *)Interrupts::apicTimer[0])->OneShot(CPU::x64::IRQ16, 100); // ((APIC::Timer *)Interrupts::apicTimer[0])->OneShot(CPU::x64::IRQ16, 100);
#endif #endif
TaskingLock.Unlock();
this->IPCManager = new InterProcessCommunication::IPC;
TaskingLock.Lock(__FUNCTION__);
debug("Tasking Started"); debug("Tasking Started");
} }

1
include/task.hpp
View File

@ -147,6 +147,7 @@ namespace Tasking
{ {
private: private:
Security SecurityManager; Security SecurityManager;
InterProcessCommunication::IPC *IPCManager = nullptr;
UPID NextPID = 0; UPID NextPID = 0;
UTID NextTID = 0; UTID NextTID = 0;