From b96572fe175d4ea8bee25c19f91426ea10042d1f Mon Sep 17 00:00:00 2001 From: Amlal EL Mahrouss Date: Fri, 22 Nov 2024 10:58:57 +0100 Subject: CUSA/UPS: Freeze process before killing it (if exit code is successful) Signed-off-by: Amlal EL Mahrouss --- dev/ZKAKit/src/UserProcessScheduler.cc | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'dev/ZKAKit/src') diff --git a/dev/ZKAKit/src/UserProcessScheduler.cc b/dev/ZKAKit/src/UserProcessScheduler.cc index 313f1532..9a4918af 100644 --- a/dev/ZKAKit/src/UserProcessScheduler.cc +++ b/dev/ZKAKit/src/UserProcessScheduler.cc @@ -229,18 +229,19 @@ namespace Kernel /***********************************************************************************/ /** - @brief Process exit method. + @brief Exit process method. + @param exit_code The process's exit code. */ /***********************************************************************************/ - void UserProcess::Exit(const Int32& exit_code) + Void UserProcess::Exit(const Int32& exit_code) { - this->Status = exit_code > 0 ? ProcessStatusKind::kKilled : ProcessStatusKind::KFinishing; + this->Status = exit_code > 0 ? ProcessStatusKind::kKilled : ProcessStatusKind::kFrozen; this->fLastExitCode = exit_code; kLastExitCode = exit_code; - auto memory_list = this->MemoryHeap; + auto memory_heap_list = this->MemoryHeap; #ifdef __ZKA_AMD64__ auto pd = hal_read_cr3(); @@ -248,23 +249,23 @@ namespace Kernel #endif // Deleting memory lists. Make sure to free all of them. - while (memory_list) + while (memory_heap_list) { - if (memory_list->MemoryEntry) + if (memory_heap_list->MemoryEntry) { - MUST_PASS(mm_delete_heap(memory_list->MemoryEntry)); + MUST_PASS(mm_delete_heap(memory_heap_list->MemoryEntry)); } #ifdef __ZKA_AMD64__ hal_write_cr3(pd); #endif - auto next = memory_list->MemoryNext; + auto next = memory_heap_list->MemoryNext; - mm_delete_heap(memory_list); - memory_list = nullptr; + mm_delete_heap(memory_heap_list); - memory_list = next; + memory_heap_list = nullptr; + memory_heap_list = next; } //! Free the memory's page directory. -- cgit v1.2.3 From d2d6b4cb728e3e80c10d6e3bbd72e6f7b3dfea9b Mon Sep 17 00:00:00 2001 From: Amlal EL Mahrouss Date: Sat, 23 Nov 2024 08:44:49 +0100 Subject: META: Morning bump. Signed-off-by: Amlal EL Mahrouss --- dev/Modules/FB/WS.h | 24 ++++++++++++++++-------- dev/Modules/WSGL/WSGL.h | 26 ++++++++++++++++++++++++++ dev/ZKAKit/KernelKit/ThreadLocalStorage.h | 10 +++++----- dev/ZKAKit/src/ThreadLocalStorage.cc | 2 +- 4 files changed, 48 insertions(+), 14 deletions(-) (limited to 'dev/ZKAKit/src') diff --git a/dev/Modules/FB/WS.h b/dev/Modules/FB/WS.h index d8c5c991..60c7a78c 100644 --- a/dev/Modules/FB/WS.h +++ b/dev/Modules/FB/WS.h @@ -7,18 +7,21 @@ #pragma once #include -#include -#include #include /// @file WS.h -/// @brief WindowServer's endpoint implementation. (within the zka-dev subsystem) +/// @brief WindowServer's window ownership implementation. +/// It is used to draw within a window. + +#define rtl_allocate_backbuffer(width, height) new WS::WSBackBufferKind[width * height] +#define rtl_compute_fb_geometry(width, height) (width * height) namespace WS { using namespace Kernel; - struct WSWindowContainer; + class WSWindowTexture; + class WSWindowContainer; typedef UInt32* WSBackBufferKind; @@ -31,7 +34,7 @@ namespace WS ZKA_COPY_DEFAULT(WSWindowContainer); /// @note the trick is, it could be GPU processed data, that's the cool thing. - BOOL PopulateWindow(WSBackBufferKind contents_buf, SizeT contents_len) + BOOL Fill(WSBackBufferKind contents_buf, SizeT contents_len) { if (contents_len > BackBufferLength) return NO; @@ -47,11 +50,16 @@ namespace WS return YES; } + BOOL Fill(WSWindowContainer* container) + { + if (!container) + return NO; + + return this->Fill(container->BackBuffer, container->BackBufferLength); + } + public: WSBackBufferKind BackBuffer{nullptr}; SizeT BackBufferLength{0UL}; }; } // namespace WS - -#define rtl_allocate_backbuffer(width, height) new WS::WSBackBufferKind[width * height] -#define rtl_compute_fb_geometry(width, height) (width * height) diff --git a/dev/Modules/WSGL/WSGL.h b/dev/Modules/WSGL/WSGL.h index 47bf402f..59cf6f5c 100644 --- a/dev/Modules/WSGL/WSGL.h +++ b/dev/Modules/WSGL/WSGL.h @@ -7,3 +7,29 @@ #pragma once #include +#include + +namespace WS +{ + /// @brief GPU texture class. + class WSWindowTexture final + { + public: + explicit WSWindowTexture() = default; + ~WSWindowTexture() = default; + + ZKA_COPY_DEFAULT(WSWindowTexture); + + VoidPtr InputData{nullptr}; + VoidPtr ProcessUnit{nullptr}; + BOOL* IsDone{nullptr}; + + const BOOL TryIsDone() + { + if (IsDone && *IsDone) + return YES; + + return NO; + } + }; +} // namespace WS diff --git a/dev/ZKAKit/KernelKit/ThreadLocalStorage.h b/dev/ZKAKit/KernelKit/ThreadLocalStorage.h index 680a10ed..808951a2 100644 --- a/dev/ZKAKit/KernelKit/ThreadLocalStorage.h +++ b/dev/ZKAKit/KernelKit/ThreadLocalStorage.h @@ -4,8 +4,8 @@ ------------------------------------------- */ -#ifndef _KERNELKIT_TLS_H -#define _KERNELKIT_TLS_H +#ifndef KERNELKIT_TLS_H +#define KERNELKIT_TLS_H #include @@ -23,8 +23,8 @@ struct THREAD_INFORMATION_BLOCK; /// Located in GS on AMD64, other architectures have their own stuff. (64x0, 32x0, ARM64) struct PACKED THREAD_INFORMATION_BLOCK final { - Kernel::Char f_Cookie[kTLSCookieLen]{0}; //! Thread magic number. - Kernel::VoidPtr f_ThreadRecord{nullptr}; //! Thread information record. + Kernel::Char Cookie[kTLSCookieLen]{0}; //! Thread magic number. + Kernel::VoidPtr Record{nullptr}; //! Thread information record. }; ///! @brief Cookie Sanity check. @@ -51,4 +51,4 @@ EXTERN_C Kernel::Bool tls_check_syscall_impl(Kernel::VoidPtr TIB) noexcept; // last rev 7/7/24 -#endif /* ifndef _KERNELKIT_TLS_H */ +#endif /* ifndef KERNELKIT_TLS_H */ diff --git a/dev/ZKAKit/src/ThreadLocalStorage.cc b/dev/ZKAKit/src/ThreadLocalStorage.cc index fbe9a5f0..69da2f94 100644 --- a/dev/ZKAKit/src/ThreadLocalStorage.cc +++ b/dev/ZKAKit/src/ThreadLocalStorage.cc @@ -29,7 +29,7 @@ using namespace Kernel; Boolean tls_check_tib(THREAD_INFORMATION_BLOCK* tib_ptr) { if (!tib_ptr || - !tib_ptr->f_ThreadRecord) + !tib_ptr->Record) return false; IEncoderObject encoder; -- cgit v1.2.3 From 476e896ba9169b4b71c1e80d3e44dd006934b3e5 Mon Sep 17 00:00:00 2001 From: Amlal EL Mahrouss Date: Sat, 23 Nov 2024 13:50:09 +0100 Subject: Kernel: Fix memory leaks and document the DLL dyld. Kernel: Document Drive manager of minoskrnl. Signed-off-by: Amlal EL Mahrouss --- dev/ZKAKit/KernelKit/IDLLObject.h | 7 ++++--- dev/ZKAKit/KernelKit/IPEFDLLObject.h | 4 ++-- dev/ZKAKit/src/DriveMgr.cc | 2 +- dev/ZKAKit/src/IPEFDLLObject.cc | 11 +++++------ 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'dev/ZKAKit/src') diff --git a/dev/ZKAKit/KernelKit/IDLLObject.h b/dev/ZKAKit/KernelKit/IDLLObject.h index 81b43ae8..bf336267 100644 --- a/dev/ZKAKit/KernelKit/IDLLObject.h +++ b/dev/ZKAKit/KernelKit/IDLLObject.h @@ -14,6 +14,7 @@ namespace Kernel { + /// @brief DLL class object. A handle to a shared library. class IDLLObject { public: @@ -22,12 +23,12 @@ namespace Kernel struct DLL_TRAITS final { - VoidPtr fImageObject{nullptr}; - VoidPtr fImageEntrypointOffset{nullptr}; + VoidPtr ImageObject{nullptr}; + VoidPtr ImageEntrypointOffset{nullptr}; Bool IsValid() { - return fImageObject && fImageEntrypointOffset; + return ImageObject && ImageEntrypointOffset; } }; diff --git a/dev/ZKAKit/KernelKit/IPEFDLLObject.h b/dev/ZKAKit/KernelKit/IPEFDLLObject.h index 64e5c2fd..450b3a13 100644 --- a/dev/ZKAKit/KernelKit/IPEFDLLObject.h +++ b/dev/ZKAKit/KernelKit/IPEFDLLObject.h @@ -48,7 +48,7 @@ namespace Kernel public: void Mount(DLL_TRAITS* to_mount) { - if (!to_mount || !to_mount->fImageObject) + if (!to_mount || !to_mount->ImageObject) return; fMounted = to_mount; @@ -61,7 +61,7 @@ namespace Kernel if (!fLoader) { - fLoader = new PEFLoader(fMounted->fImageObject); + fLoader = new PEFLoader(fMounted->ImageObject); } } diff --git a/dev/ZKAKit/src/DriveMgr.cc b/dev/ZKAKit/src/DriveMgr.cc index 4946e714..d2c08c19 100644 --- a/dev/ZKAKit/src/DriveMgr.cc +++ b/dev/ZKAKit/src/DriveMgr.cc @@ -14,7 +14,7 @@ /***********************************************************************************/ /// @file DriveMgr.cc -/// @brief Drive Manager API. +/// @brief Drive Manager of minoskrnl. /***********************************************************************************/ namespace Kernel diff --git a/dev/ZKAKit/src/IPEFDLLObject.cc b/dev/ZKAKit/src/IPEFDLLObject.cc index b72421d8..67150854 100644 --- a/dev/ZKAKit/src/IPEFDLLObject.cc +++ b/dev/ZKAKit/src/IPEFDLLObject.cc @@ -46,7 +46,6 @@ EXTERN_C IDLL rtl_init_dll(UserProcess* header) if (!dll_obj) { header->Crash(); - return nullptr; } @@ -54,22 +53,22 @@ EXTERN_C IDLL rtl_init_dll(UserProcess* header) if (!dll_obj->Get()) { + tls_delete_class(dll_obj); header->Crash(); - return nullptr; } - dll_obj->Get()->fImageObject = + dll_obj->Get()->ImageObject = header->Image.fBlob; - if (!dll_obj->Get()->fImageObject) + if (!dll_obj->Get()->ImageObject) { + tls_delete_class(dll_obj); header->Crash(); - return nullptr; } - dll_obj->Get()->fImageEntrypointOffset = + dll_obj->Get()->ImageEntrypointOffset = dll_obj->Load(kPefStart, rt_string_len(kPefStart, 0), kPefCode); return dll_obj; -- cgit v1.2.3