diff options
| -rw-r--r-- | .github/workflows/kernel-ahci-dev.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/kernel-ahci.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/kernel-pio-dev.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/kernel-pio.yml | 2 | ||||
| -rwxr-xr-x | scripts/any_ci_x64.sh (renamed from scripts/kernel_ci_x64.sh) | 0 | ||||
| -rwxr-xr-x | scripts/gdb.sh (renamed from gdb.sh) | 0 | ||||
| -rw-r--r-- | src/kernel/KernelKit/Config.h | 4 | ||||
| -rw-r--r-- | src/kernel/KernelKit/CoreProcessScheduler.h | 1 | ||||
| -rw-r--r-- | src/kernel/KernelKit/TraceSrv.h | 1 | ||||
| -rw-r--r-- | src/kernel/KernelKit/UserProcessScheduler.h | 3 | ||||
| -rw-r--r-- | src/kernel/NeKit/Config.h | 4 |
11 files changed, 11 insertions, 10 deletions
diff --git a/.github/workflows/kernel-ahci-dev.yml b/.github/workflows/kernel-ahci-dev.yml index 296f5e87..91f235ee 100644 --- a/.github/workflows/kernel-ahci-dev.yml +++ b/.github/workflows/kernel-ahci-dev.yml @@ -15,4 +15,4 @@ jobs: - uses: actions/checkout@v4 - name: Build CI run: sudo curl https://github.com/ne-foss-org/nebuild/releases/download/v0.0.6-apple-m1/nebuild-debian -o /bin/nebuild && sudo chmod +x /bin/nebuild && sudo apt update && sudo apt install mingw-w64 qemu-utils nasm && - ./scripts/modules_ahci_x64.sh && ./scripts/setup_x64_project.sh && ./scripts/kernel_ci_x64.sh
\ No newline at end of file + ./scripts/modules_ahci_x64.sh && ./scripts/setup_x64_project.sh && ./scripts/any_ci_x64.sh
\ No newline at end of file diff --git a/.github/workflows/kernel-ahci.yml b/.github/workflows/kernel-ahci.yml index aab4c4ec..766b892d 100644 --- a/.github/workflows/kernel-ahci.yml +++ b/.github/workflows/kernel-ahci.yml @@ -15,5 +15,5 @@ jobs: - uses: actions/checkout@v4 - name: Build CI run: sudo curl https://github.com/ne-foss-org/nebuild/releases/download/v0.0.6-apple-m1/nebuild-debian -o /bin/nebuild && sudo chmod +x /bin/nebuild && sudo apt update && sudo apt install mingw-w64 qemu-utils nasm && - ./scripts/modules_ahci_x64.sh && ./scripts/setup_x64_project.sh && ./scripts/kernel_ci_x64.sh + ./scripts/modules_ahci_x64.sh && ./scripts/setup_x64_project.sh && ./scripts/any_ci_x64.sh diff --git a/.github/workflows/kernel-pio-dev.yml b/.github/workflows/kernel-pio-dev.yml index a2e95db3..cc97e07b 100644 --- a/.github/workflows/kernel-pio-dev.yml +++ b/.github/workflows/kernel-pio-dev.yml @@ -15,5 +15,5 @@ jobs: - uses: actions/checkout@v4 - name: Build CI run: sudo curl https://github.com/ne-foss-org/nebuild/releases/download/v0.0.6-apple-m1/nebuild-debian -o /bin/nebuild && sudo chmod +x /bin/nebuild && sudo apt update && sudo apt install mingw-w64 qemu-utils nasm && - ./scripts/modules_pio_x64.sh && ./scripts/setup_x64_project.sh && ./scripts/kernel_ci_x64.sh + ./scripts/modules_pio_x64.sh && ./scripts/setup_x64_project.sh && ./scripts/any_ci_x64.sh
\ No newline at end of file diff --git a/.github/workflows/kernel-pio.yml b/.github/workflows/kernel-pio.yml index 2cd45b9e..d57eddde 100644 --- a/.github/workflows/kernel-pio.yml +++ b/.github/workflows/kernel-pio.yml @@ -15,5 +15,5 @@ jobs: - uses: actions/checkout@v4 - name: Build CI run: sudo curl https://github.com/ne-foss-org/nebuild/releases/download/v0.0.6-apple-m1/nebuild-debian -o /bin/nebuild && sudo chmod +x /bin/nebuild && sudo apt update && sudo apt install mingw-w64 qemu-utils nasm && - ./scripts/modules_pio_x64.sh && ./scripts/setup_x64_project.sh && ./scripts/kernel_ci_x64.sh + ./scripts/modules_pio_x64.sh && ./scripts/setup_x64_project.sh && ./scripts/any_ci_x64.sh
\ No newline at end of file diff --git a/scripts/kernel_ci_x64.sh b/scripts/any_ci_x64.sh index 614ff65e..614ff65e 100755 --- a/scripts/kernel_ci_x64.sh +++ b/scripts/any_ci_x64.sh diff --git a/src/kernel/KernelKit/Config.h b/src/kernel/KernelKit/Config.h index 8076a1c2..2df23851 100644 --- a/src/kernel/KernelKit/Config.h +++ b/src/kernel/KernelKit/Config.h @@ -8,8 +8,8 @@ #include <NeKit/Config.h> -#define KERNELKIT_VERSION "0.0.2" -#define KERNELKIT_VERSION_BCD 0x0002 +#define KERNELKIT_VERSION "0.0.3" +#define KERNELKIT_VERSION_BCD 0x0003 namespace Kernel { class UserProcessScheduler; diff --git a/src/kernel/KernelKit/CoreProcessScheduler.h b/src/kernel/KernelKit/CoreProcessScheduler.h index f517a374..7ed23a92 100644 --- a/src/kernel/KernelKit/CoreProcessScheduler.h +++ b/src/kernel/KernelKit/CoreProcessScheduler.h @@ -20,7 +20,6 @@ #define kCPSMaxMemoryLimit (gib_cast(128)) /* max physical memory limit */ #define kCPSMaxStackSz (kib_cast(8)) /* maximum stack size */ - #define kCPSNameLen (128U) EXTERN_C void sched_idle_task(void); diff --git a/src/kernel/KernelKit/TraceSrv.h b/src/kernel/KernelKit/TraceSrv.h index 998a14e9..47877349 100644 --- a/src/kernel/KernelKit/TraceSrv.h +++ b/src/kernel/KernelKit/TraceSrv.h @@ -7,6 +7,7 @@ #define KERNELKIT_TRACESRV_H #include <CompilerKit/CompilerKit.h> +#include <NeKit/NeKit.h> namespace Kernel { diff --git a/src/kernel/KernelKit/UserProcessScheduler.h b/src/kernel/KernelKit/UserProcessScheduler.h index b4fc1d99..ab3c713e 100644 --- a/src/kernel/KernelKit/UserProcessScheduler.h +++ b/src/kernel/KernelKit/UserProcessScheduler.h @@ -63,7 +63,8 @@ class UserProcess final { IDylibObject* DylibDelegate{nullptr}; SizeT MemoryCursor{0UL}; SizeT MemoryLimit{kCPSMaxMemoryLimit}; - SizeT UsedMemory{0UL}; + SizeT UsedMemory{0UL}; /// AMLALE: This should be thread-safe as well. + SizeT UsedFiles{0UL}; /// AMLALE: This is a thread-safe counter to track file allocation count. UserProcessSignal Signal; ProcessImage Image; diff --git a/src/kernel/NeKit/Config.h b/src/kernel/NeKit/Config.h index 02189b47..caf17ebd 100644 --- a/src/kernel/NeKit/Config.h +++ b/src/kernel/NeKit/Config.h @@ -8,8 +8,8 @@ #include <NeKit/Macros.h> -#define NEKIT_VERSION_STR "0.0.2" -#define NEKIT_VERSION_BCD 0x0002 +#define NEKIT_VERSION "0.0.3" +#define NEKIT_VERSION_BCD 0x0003 #if __cplusplus < 202002L #error !!! NeKernel compiles with C++20 as of December 4, 2025 !!! |
