feat: wip: new tree kind 'kSpecial' and refactor user scheduler code temporary regarding FileTree allocation.

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>

5 files changed, 49 insertions, 45 deletions

diff --git a/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc b/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc
index 8b4c0d1a..79f25920 100644
--- a/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc
+++ b/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc
@@ -45,15 +45,15 @@ struct HAL_APIC_MADT;
 struct HAL_HARDWARE_THREAD;
 
 struct HAL_HARDWARE_THREAD final {
-  HAL::StackFramePtr mFramePtr;
-  ProcessID          mThreadID{0};
+  StackFramePtr mFramePtr;
+  ProcessID     mThreadID{0};
 };
 
-EXTERN_C Void sched_jump_to_task(HAL::StackFramePtr stack_frame);
+EXTERN_C Void sched_jump_to_task(StackFramePtr stack_frame);
 
-STATIC HAL_APIC_MADT* kMADTBlock = nullptr;
-STATIC Bool           kSMPAware  = false;
-STATIC Int64          kSMPCount  = 0;
+STATIC HAL_APIC_MADT* kSMPBlock = nullptr;
+STATIC Bool           kSMPAware = false;
+STATIC Int64          kSMPCount = 0;
 
 EXTERN_C UIntPtr kApicBaseAddress;
 
@@ -160,11 +160,11 @@ Void mp_init_cores(VoidPtr vendor_ptr) noexcept {
     return;
   }
 
-  kRawMADT   = pwr.Leak().Leak();
-  kMADTBlock = reinterpret_cast<HAL_APIC_MADT*>(kRawMADT);
-  kSMPAware  = NO;
+  kRawMADT  = pwr.Leak().Leak();
+  kSMPBlock = reinterpret_cast<HAL_APIC_MADT*>(kRawMADT);
+  kSMPAware = NO;
 
-  if (kMADTBlock) {
+  if (kSMPBlock) {
     kSMPInterrupt = 0;
     kSMPCount     = 0;
 
@@ -191,8 +191,8 @@ Void mp_init_cores(VoidPtr vendor_ptr) noexcept {
     controller.Write(LAPIC_REG_TIMER_LVT, 0x20 | (1 << 17));
     controller.Write(LAPIC_REG_TIMER_INITCNT, 1000000);
 
-    volatile UInt8* entry_ptr = reinterpret_cast<volatile UInt8*>(kMADTBlock->List);
-    volatile UInt8* end_ptr   = ((UInt8*) kMADTBlock) + kMADTBlock->Length;
+    volatile UInt8* entry_ptr = reinterpret_cast<volatile UInt8*>(kSMPBlock->List);
+    volatile UInt8* end_ptr   = ((UInt8*) kSMPBlock) + kSMPBlock->Length;
 
     while (entry_ptr < end_ptr) {
       UInt8 type   = *entry_ptr;
diff --git a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc
index cd41480a..3363e809 100644
--- a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc
+++ b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc
@@ -136,7 +136,7 @@ template <BOOL Write, BOOL CommandOrCTRL, BOOL Identify>
 STATIC Void drv_std_input_output_ahci(UInt64 lba, UInt8* buffer, SizeT sector_sz,
                                       SizeT size_buffer) noexcept {
   if (sector_sz == 0) {
-    kout << "Invalid sector size.\r";
+    kout << "ahci: Invalid sector size.\r";
     err_global_get() = kErrorDisk;
     return;
   }
@@ -144,7 +144,7 @@ STATIC Void drv_std_input_output_ahci(UInt64 lba, UInt8* buffer, SizeT sector_sz
   lba /= sector_sz;
 
   if (!buffer || size_buffer == 0) {
-    kout << "Invalid buffer for AHCI I/O.\r";
+    kout << "ahci: Invalid buffer for AHCI I/O.\r";
     err_global_get() = kErrorDisk;
     return;
   }
@@ -157,7 +157,7 @@ STATIC Void drv_std_input_output_ahci(UInt64 lba, UInt8* buffer, SizeT sector_sz
 
   while (slot == ~0UL) {
     if (timeout > kTimeout) {
-      kout << "No free command slot found, AHCI disk is busy!\r";
+      kout << "ahci: No free command slot found, AHCI disk is busy!\r";
 
       err_global_get() = kErrorDisk;
       return;
@@ -217,7 +217,7 @@ STATIC Void drv_std_input_output_ahci(UInt64 lba, UInt8* buffer, SizeT sector_sz
   command_table->Prdt[prdt_index - 1].Ie = YES;
 
   if (bytes_remaining > 0) {
-    kout << "Warning: AHCI PRDT overflow, cannot map full buffer.\r";
+    kout << "ahci: AHCI PRDT overflow, cannot map full buffer.\r";
     err_global_get() = kErrorDisk;
     rtl_dma_free(size_buffer);
 
@@ -262,7 +262,7 @@ STATIC Void drv_std_input_output_ahci(UInt64 lba, UInt8* buffer, SizeT sector_sz
 
   while (YES) {
     if (timeout > kTimeout) {
-      kout << "Disk hangup!\r";
+      kout << "ahci: disk-hangup, corrupted-disk.\r";
       err_global_get() = kErrorDiskIsCorrupted;
       rtl_dma_free(size_buffer);
 
@@ -277,7 +277,7 @@ STATIC Void drv_std_input_output_ahci(UInt64 lba, UInt8* buffer, SizeT sector_sz
   rtl_dma_flush(ptr, size_buffer);
 
   if (kSATAHba->Is & kSATAErrTaskFile) {
-    kout << "AHCI Task File Error during I/O.\r";
+    kout << "ahci: Task File Error during I/O.\r";
 
     rtl_dma_free(size_buffer);
     err_global_get() = kErrorDiskIsCorrupted;
@@ -293,9 +293,8 @@ STATIC Void drv_std_input_output_ahci(UInt64 lba, UInt8* buffer, SizeT sector_sz
     if ((kSATAHba->Ports[kSATAIndex].Tfd & (kSATASRBsy | kSATASRDrq)) == 0) {
       goto ahci_io_end;
     } else {
-      kout << "Warning: Disk still busy after command completion!\r";
-      while (kSATAHba->Ports[kSATAIndex].Tfd & (kSATASRBsy | kSATASRDrq))
-        ;
+      kout << "ahci: Disk still busy after command completion!\r";
+      while (kSATAHba->Ports[kSATAIndex].Tfd & (kSATASRBsy | kSATASRDrq));
     }
 
   ahci_io_end:
@@ -308,13 +307,15 @@ STATIC Void drv_std_input_output_ahci(UInt64 lba, UInt8* buffer, SizeT sector_sz
   @brief Gets the number of sectors inside the drive.
   @return Sector size in bytes.
  */
-STATIC ATTRIBUTE(unused) SizeT drv_get_sector_count_ahci() {
+STATIC ATTRIBUTE(unused)
+SizeT  drv_get_sector_count_ahci() {
   return kSATASectorCount;
 }
 
 /// @brief Get the drive size.
 /// @return Disk size in bytes.
-STATIC ATTRIBUTE(unused) SizeT drv_get_size_ahci() {
+STATIC ATTRIBUTE(unused)
+SizeT  drv_get_size_ahci() {
   return drv_std_get_sector_count() * kAHCISectorSize;
 }
 
diff --git a/dev/kernel/KernelKit/CoreProcessScheduler.h b/dev/kernel/KernelKit/CoreProcessScheduler.h
index e8ac158e..170244eb 100644
--- a/dev/kernel/KernelKit/CoreProcessScheduler.h
+++ b/dev/kernel/KernelKit/CoreProcessScheduler.h
@@ -19,7 +19,7 @@
 #define kSchedTeamCount (256U)
 
 #define kSchedMaxMemoryLimit (gib_cast(128)) /* max physical memory limit */
-#define kSchedMaxStackSz (kib_cast(8))     /* maximum stack size */
+#define kSchedMaxStackSz (kib_cast(8))       /* maximum stack size */
 
 #define kSchedNameLen (128U)
 
@@ -36,6 +36,9 @@ template <typename T>
 struct PROCESS_HEAP_TREE;
 
 template <typename T>
+struct PROCESS_SPECIAL_TREE;
+
+template <typename T>
 struct PROCESS_FILE_TREE;
 
 enum {
@@ -47,9 +50,9 @@ enum {
 
 template <typename T>
 struct PROCESS_HEAP_TREE {
-  static constexpr auto kHeap = true;
-  static constexpr auto kFile  = false;
-  static constexpr auto kSpecial  = false;
+  static constexpr auto kHeap    = true;
+  static constexpr auto kFile    = false;
+  static constexpr auto kSpecial = false;
 
   T     Entry{nullptr};
   SizeT EntrySize{0UL};
@@ -74,9 +77,9 @@ struct PROCESS_HEAP_TREE {
 
 template <typename T>
 struct PROCESS_FILE_TREE {
-  static constexpr auto kHeap = false;
-  static constexpr auto kFile  = true;
-  static constexpr auto kSpecial  = false;
+  static constexpr auto kHeap    = false;
+  static constexpr auto kFile    = true;
+  static constexpr auto kSpecial = false;
 
   T     Entry{nullptr};
   SizeT EntrySize{0UL};
diff --git a/dev/kernel/KernelKit/UserProcessScheduler.h b/dev/kernel/KernelKit/UserProcessScheduler.h
index 8a730233..3dae178a 100644
--- a/dev/kernel/KernelKit/UserProcessScheduler.h
+++ b/dev/kernel/KernelKit/UserProcessScheduler.h
@@ -96,7 +96,7 @@ class USER_PROCESS final {
   /***********************************************************************************/
   ///! @brief Spawns a dynamic library handle if dylib.
   /***********************************************************************************/
-  Bool SpawnDylib();
+  Bool InitDylib();
 
   /***********************************************************************************/
   ///! @brief Exits the app.
@@ -192,7 +192,7 @@ class UserProcessScheduler final : public ISchedulable {
   NE_MOVE_DELETE(UserProcessScheduler)
 
  public:
-       operator bool();
+  operator bool();
   bool operator!();
 
  public:
diff --git a/dev/kernel/src/UserProcessScheduler.cc b/dev/kernel/src/UserProcessScheduler.cc
index 7e14fa62..45957c7b 100644
--- a/dev/kernel/src/UserProcessScheduler.cc
+++ b/dev/kernel/src/UserProcessScheduler.cc
@@ -122,20 +122,9 @@ ErrorOr<VoidPtr> USER_PROCESS::New(SizeT sz, SizeT pad_amount) {
 
   hal_write_cr3(vm_register);
 #else
-  auto ptr           = mm_alloc_ptr(sz, Yes, Yes, pad_amount);
+  auto ptr = mm_alloc_ptr(sz, Yes, Yes, pad_amount);
 #endif
 
-  if (!this->FileTree) {
-    this->FileTree = new PROCESS_FILE_TREE<VoidPtr>();
-
-    if (!this->FileTree) {
-      this->Crash();
-      return ErrorOr<VoidPtr>(-kErrorHeapOutOfMemory);
-    }
-
-    /// @todo File Tree allocation and dispose methods (amlal)
-  }
-
   if (!this->HeapTree) {
     this->HeapTree = new PROCESS_HEAP_TREE<VoidPtr>();
 
@@ -335,7 +324,7 @@ Void USER_PROCESS::Exit(const Int32& exit_code) {
 /// @brief Add dylib to the process object.
 /***********************************************************************************/
 
-Bool USER_PROCESS::SpawnDylib() {
+Bool USER_PROCESS::InitDylib() {
   // React according to the process's kind.
   switch (this->Kind) {
     case USER_PROCESS::kExecutableDylibKind: {
@@ -437,6 +426,17 @@ ProcessID UserProcessScheduler::Spawn(const Char* name, VoidPtr code, VoidPtr im
   process.PTime     = 0;
   process.RTime     = 0;
 
+  if (!process.FileTree) {
+    process.FileTree = new PROCESS_FILE_TREE<VoidPtr>();
+
+    if (!process.FileTree) {
+      process.Crash();
+      return ErrorOr<VoidPtr>(-kErrorHeapOutOfMemory);
+    }
+
+    /// @todo File Tree allocation and dispose methods (amlal)
+  }
+
   (Void)(kout << "PID: " << number(process.ProcessId) << kendl);
   (Void)(kout << "Name: " << process.Name << kendl);