summaryrefslogtreecommitdiffhomepage
path: root/src/kernel/KernelKit
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal@nekernel.org>2025-12-09 02:50:07 +0100
committerAmlal El Mahrouss <amlal@nekernel.org>2025-12-09 02:52:34 +0100
commit4d192e629a07ae457134cb0063e0136e54b01008 (patch)
treeb933444d27c2b9ac22693e2e65bd294792c79d39 /src/kernel/KernelKit
parentf78c535aec66e02584e1b02995dc12c9e1bcb64c (diff)
chore: Codebase improvements and tweaks.
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
Diffstat (limited to 'src/kernel/KernelKit')
-rw-r--r--src/kernel/KernelKit/BinaryMutex.h4
-rw-r--r--src/kernel/KernelKit/Config.h4
-rw-r--r--src/kernel/KernelKit/CoreProcessScheduler.h52
-rw-r--r--src/kernel/KernelKit/IPEFDylibObject.h4
-rw-r--r--src/kernel/KernelKit/KernelTaskScheduler.h8
-rw-r--r--src/kernel/KernelKit/UserProcessScheduler.h32
-rw-r--r--src/kernel/KernelKit/UserProcessScheduler.inl8
7 files changed, 56 insertions, 56 deletions
diff --git a/src/kernel/KernelKit/BinaryMutex.h b/src/kernel/KernelKit/BinaryMutex.h
index f8a2898b..12dc7d15 100644
--- a/src/kernel/KernelKit/BinaryMutex.h
+++ b/src/kernel/KernelKit/BinaryMutex.h
@@ -11,12 +11,12 @@
#include <NeKit/Config.h>
namespace Kernel {
-class USER_PROCESS;
+class UserProcess;
/// @brief Access control class, which locks a task until one is done.
class BinaryMutex final {
public:
- using LockedPtr = USER_PROCESS*;
+ using LockedPtr = UserProcess*;
explicit BinaryMutex() = default;
~BinaryMutex() = default;
diff --git a/src/kernel/KernelKit/Config.h b/src/kernel/KernelKit/Config.h
index 6db4bdf7..f0d1e106 100644
--- a/src/kernel/KernelKit/Config.h
+++ b/src/kernel/KernelKit/Config.h
@@ -14,6 +14,6 @@
namespace Kernel {
class UserProcessScheduler;
class IDylibObject;
-class USER_PROCESS;
-class KERNEL_TASK;
+class UserProcess;
+class KernelTask;
} // namespace Kernel \ No newline at end of file
diff --git a/src/kernel/KernelKit/CoreProcessScheduler.h b/src/kernel/KernelKit/CoreProcessScheduler.h
index da89b112..5071f85d 100644
--- a/src/kernel/KernelKit/CoreProcessScheduler.h
+++ b/src/kernel/KernelKit/CoreProcessScheduler.h
@@ -26,22 +26,22 @@
EXTERN_C void sched_idle_task(void);
namespace Kernel {
-class USER_PROCESS;
-class KERNEL_TASK;
+class UserProcess;
+class KernelTask;
class KernelTaskScheduler;
class UserProcessScheduler;
class UserProcessTeam;
template <typename T>
-struct PROCESS_HEAP_TREE;
+struct ProcessHeapTree;
template <typename T>
-struct PROCESS_SPECIAL_TREE;
+struct ProcessSpecialTree;
template <typename T>
-struct PROCESS_FILE_TREE;
+struct ProcessFileTree;
-enum {
+enum struct TreeKind : UInt32 {
kInvalidTreeKind = 0U,
kRedTreeKind = 100U,
kBlackTreeKind = 101U,
@@ -49,7 +49,7 @@ enum {
};
template <typename T>
-struct PROCESS_HEAP_TREE {
+struct ProcessHeapTree {
static constexpr auto kHeap = true;
static constexpr auto kFile = false;
static constexpr auto kSpecial = false;
@@ -58,25 +58,25 @@ struct PROCESS_HEAP_TREE {
SizeT EntrySize{0UL};
SizeT EntryPad{0UL};
- UInt32 Color{kBlackTreeKind};
+ TreeKind Color{TreeKind::kBlackTreeKind};
- struct PROCESS_HEAP_TREE<T>* Parent {
+ struct ProcessHeapTree<T>* Parent {
nullptr
};
- struct PROCESS_HEAP_TREE<T>* Child {
+ struct ProcessHeapTree<T>* Child {
nullptr
};
- struct PROCESS_HEAP_TREE<T>* Prev {
+ struct ProcessHeapTree<T>* Prev {
nullptr
};
- struct PROCESS_HEAP_TREE<T>* Next {
+ struct ProcessHeapTree<T>* Next {
nullptr
};
};
template <typename T>
-struct PROCESS_FILE_TREE {
+struct ProcessFileTree {
static constexpr auto kHeap = false;
static constexpr auto kFile = true;
static constexpr auto kSpecial = false;
@@ -85,21 +85,21 @@ struct PROCESS_FILE_TREE {
SizeT EntrySize{0UL};
SizeT EntryPad{0UL};
- UInt32 Color{kBlackTreeKind};
+ TreeKind Color{TreeKind::kBlackTreeKind};
- struct PROCESS_FILE_TREE<T>* Parent {
+ struct ProcessFileTree<T>* Parent {
nullptr
};
- struct PROCESS_FILE_TREE<T>* Child {
+ struct ProcessFileTree<T>* Child {
nullptr
};
- struct PROCESS_FILE_TREE<T>* Prev {
+ struct ProcessFileTree<T>* Prev {
nullptr
};
- struct PROCESS_FILE_TREE<T>* Next {
+ struct ProcessFileTree<T>* Next {
nullptr
};
};
@@ -107,7 +107,7 @@ struct PROCESS_FILE_TREE {
using ProcessCtx = UInt32;
template <typename T>
-struct PROCESS_SPECIAL_TREE {
+struct ProcessSpecialTree {
static constexpr auto kHeap = false;
static constexpr auto kFile = false;
static constexpr auto kSpecial = true;
@@ -119,21 +119,21 @@ struct PROCESS_SPECIAL_TREE {
/// @brief a context is where the resource comes from.
ProcessCtx EntryContext{0UL}; // could be a socket, printer, device...
- UInt32 Color{kBlackTreeKind};
+ TreeKind Color{TreeKind::kBlackTreeKind};
- struct PROCESS_SPECIAL_TREE<T>* Parent {
+ struct ProcessSpecialTree<T>* Parent {
nullptr
};
- struct PROCESS_SPECIAL_TREE<T>* Child {
+ struct ProcessSpecialTree<T>* Child {
nullptr
};
- struct PROCESS_SPECIAL_TREE<T>* Prev {
+ struct ProcessSpecialTree<T>* Prev {
nullptr
};
- struct PROCESS_SPECIAL_TREE<T>* Next {
+ struct ProcessSpecialTree<T>* Next {
nullptr
};
};
@@ -240,8 +240,8 @@ struct ProcessImage final {
explicit ProcessImage() = default;
private:
- friend USER_PROCESS;
- friend KERNEL_TASK;
+ friend UserProcess;
+ friend KernelTask;
friend UserProcessScheduler;
friend KernelTaskScheduler;
diff --git a/src/kernel/KernelKit/IPEFDylibObject.h b/src/kernel/KernelKit/IPEFDylibObject.h
index fb386526..d8ed3fc5 100644
--- a/src/kernel/KernelKit/IPEFDylibObject.h
+++ b/src/kernel/KernelKit/IPEFDylibObject.h
@@ -79,8 +79,8 @@ class IPEFDylibObject final NE_DYLIB_OBJECT {
typedef IPEFDylibObject* IDylibRef;
-EXTERN_C IDylibRef rtl_init_dylib_pef(USER_PROCESS& header);
-EXTERN_C Void rtl_fini_dylib_pef(USER_PROCESS& header, IDylibRef lib, Bool* successful);
+EXTERN_C IDylibRef rtl_init_dylib_pef(UserProcess& header);
+EXTERN_C Void rtl_fini_dylib_pef(UserProcess& header, IDylibRef lib, Bool* successful);
} // namespace Kernel
#endif /* ifndef __KERNELKIT_PEF_SHARED_OBJECT_H__ */
diff --git a/src/kernel/KernelKit/KernelTaskScheduler.h b/src/kernel/KernelKit/KernelTaskScheduler.h
index 9bfce1d6..714a4fa7 100644
--- a/src/kernel/KernelKit/KernelTaskScheduler.h
+++ b/src/kernel/KernelKit/KernelTaskScheduler.h
@@ -19,11 +19,11 @@ class KernelTaskHelper;
typedef ProcessID KID;
-/// @brief Equivalent of USER_PROCESS, but for kernel tasks.
+/// @brief Equivalent of UserProcess, but for kernel tasks.
/// @author Amlal
-class KERNEL_TASK final {
+class KernelTask final {
public:
- Char Name[kSchedNameLen] = {"KERNEL_TASK"};
+ Char Name[kSchedNameLen] = {"KernelTask"};
ProcessSubsystem SubSystem{ProcessSubsystem::kProcessSubsystemKernel};
HAL::StackFramePtr StackFrame{nullptr};
UInt8* StackReserve{nullptr};
@@ -40,7 +40,7 @@ class KernelTaskHelper final {
public:
STATIC Bool Add(HAL::StackFramePtr frame_ptr, ProcessID new_kid);
STATIC Bool Remove(const KID kid);
- STATIC Bool CanBeScheduled(const KERNEL_TASK& process);
+ STATIC Bool CanBeScheduled(const KernelTask& process);
STATIC ErrorOr<KID> TheCurrentKID();
STATIC SizeT StartScheduling();
};
diff --git a/src/kernel/KernelKit/UserProcessScheduler.h b/src/kernel/KernelKit/UserProcessScheduler.h
index 6a6cfd61..9d483ef4 100644
--- a/src/kernel/KernelKit/UserProcessScheduler.h
+++ b/src/kernel/KernelKit/UserProcessScheduler.h
@@ -29,21 +29,21 @@ class UserProcessScheduler;
class UserProcessHelper;
/***********************************************************************************/
-/// @name USER_PROCESS
-/// @brief USER_PROCESS class, holds information about the running process/thread.
+/// @name UserProcess
+/// @brief UserProcess class, holds information about the running process/thread.
/***********************************************************************************/
-class USER_PROCESS final NE_VETTABLE {
+class UserProcess final NE_VETTABLE {
public:
- explicit USER_PROCESS();
- ~USER_PROCESS();
+ explicit UserProcess();
+ ~UserProcess();
auto DoVet() const { return *this; }
public:
- NE_COPY_DEFAULT(USER_PROCESS)
+ NE_COPY_DEFAULT(UserProcess)
public:
- Char Name[kSchedNameLen] = {"USER_PROCESS"};
+ Char Name[kSchedNameLen] = {"UserProcess"};
ProcessSubsystem SubSystem{ProcessSubsystem::kProcessSubsystemUser};
User* Owner{nullptr};
HAL::StackFramePtr StackFrame{nullptr};
@@ -64,8 +64,8 @@ class USER_PROCESS final NE_VETTABLE {
};
USER_PROCESS_SIGNAL Signal;
- PROCESS_FILE_TREE<VoidPtr>* FileTree{nullptr};
- PROCESS_HEAP_TREE<VoidPtr>* HeapTree{nullptr};
+ ProcessFileTree<VoidPtr>* FileTree{nullptr};
+ ProcessHeapTree<VoidPtr>* HeapTree{nullptr};
UserProcessTeam* ParentTeam;
VoidPtr VMRegister{0UL};
@@ -158,8 +158,8 @@ class USER_PROCESS final NE_VETTABLE {
friend UserProcessHelper;
};
-typedef Array<USER_PROCESS, kSchedProcessLimitPerTeam> USER_PROCESS_ARRAY;
-typedef Ref<USER_PROCESS> USER_PROCESS_REF;
+typedef Array<UserProcess, kSchedProcessLimitPerTeam> USER_PROCESS_ARRAY;
+typedef Ref<UserProcess> USER_PROCESS_REF;
/// \brief Processs Team (contains multiple processes inside it.)
/// Equivalent to a process batch
@@ -170,8 +170,8 @@ class UserProcessTeam final {
NE_COPY_DEFAULT(UserProcessTeam)
- Array<USER_PROCESS, kSchedProcessLimitPerTeam>& AsArray();
- Ref<USER_PROCESS>& AsRef();
+ Array<UserProcess, kSchedProcessLimitPerTeam>& AsArray();
+ Ref<UserProcess>& AsRef();
ProcessID& Id();
public:
@@ -182,7 +182,7 @@ class UserProcessTeam final {
};
/***********************************************************************************/
-/// @brief USER_PROCESS scheduler class.
+/// @brief UserProcess scheduler class.
/// The main class which you call to schedule user processes.
/***********************************************************************************/
class UserProcessScheduler final : public ISchedulable {
@@ -224,14 +224,14 @@ class UserProcessScheduler final : public ISchedulable {
/***********************************************************************************/
/**
- * \brief USER_PROCESS helper class, which contains needed utilities for the scheduler.
+ * \brief UserProcess helper class, which contains needed utilities for the scheduler.
*/
/***********************************************************************************/
class UserProcessHelper final {
public:
STATIC Bool Switch(HAL::StackFramePtr frame_ptr, ProcessID new_pid);
- STATIC Bool CanBeScheduled(const USER_PROCESS& process);
+ STATIC Bool CanBeScheduled(const UserProcess& process);
STATIC ErrorOr<ProcessID> TheCurrentPID();
STATIC SizeT StartScheduling();
};
diff --git a/src/kernel/KernelKit/UserProcessScheduler.inl b/src/kernel/KernelKit/UserProcessScheduler.inl
index e8a57212..2ed960d5 100644
--- a/src/kernel/KernelKit/UserProcessScheduler.inl
+++ b/src/kernel/KernelKit/UserProcessScheduler.inl
@@ -21,15 +21,15 @@ namespace Kernel {
/***********************************************************************************/
template <typename T>
-BOOL USER_PROCESS::Delete(ErrorOr<T*> ptr) {
+BOOL UserProcess::Delete(ErrorOr<T*> ptr) {
if (!ptr) return No;
if (!this->HeapTree) {
- kout << "USER_PROCESS: Heap is empty.\r";
+ kout << "UserProcess: Heap is empty.\r";
return No;
}
- PROCESS_HEAP_TREE<VoidPtr>* entry = this->HeapTree;
+ ProcessHeapTree<VoidPtr>* entry = this->HeapTree;
while (entry != nullptr) {
if (entry->Entry == ptr.Leak().Leak()) {
@@ -51,7 +51,7 @@ BOOL USER_PROCESS::Delete(ErrorOr<T*> ptr) {
entry = entry->Next;
}
- kout << "USER_PROCESS: Trying to free a pointer which doesn't exist.\r";
+ kout << "UserProcess: Trying to free a pointer which doesn't exist.\r";
this->Crash();