diff options
| -rw-r--r-- | src/kernel/KernelKit/Semaphore.h | 8 | ||||
| -rw-r--r-- | src/kernel/src/HeapMgr.cpp | 11 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/kernel/KernelKit/Semaphore.h b/src/kernel/KernelKit/Semaphore.h index 4dc9a454..13f3eadb 100644 --- a/src/kernel/KernelKit/Semaphore.h +++ b/src/kernel/KernelKit/Semaphore.h @@ -29,7 +29,7 @@ using SemaphoreArr = UInt64[kSemaphoreCount]; /// @brief Checks if the semaphore is valid. inline bool rtl_sem_is_valid(const SemaphoreArr& sem, const UInt64& owner = 0) { - if (!sem) return false; + //if (!sem) return false; return sem[kSemaphoreOwnerIndex] == owner && sem[kSemaphoreCountIndex] > 0; } @@ -37,7 +37,7 @@ inline bool rtl_sem_is_valid(const SemaphoreArr& sem, const UInt64& owner = 0) { /// @param sem /// @return inline bool rtl_sem_release(SemaphoreArr& sem) { - if (!sem) return false; + //if (!sem) return false; sem[kSemaphoreOwnerIndex] = 0; sem[kSemaphoreCountIndex] = 0; @@ -50,7 +50,7 @@ inline bool rtl_sem_release(SemaphoreArr& sem) { /// @param owner the owner to set, could be anything identifitable. /// @return inline bool rtl_sem_acquire(SemaphoreArr& sem, const UInt64& owner) { - if (!sem) return false; + //if (!sem) return false; if (!owner) { err_global_get() = kErrorInvalidData; @@ -70,7 +70,7 @@ inline bool rtl_sem_acquire(SemaphoreArr& sem, const UInt64& owner) { /// @return inline bool rtl_sem_wait(SemaphoreArr& sem, const UInt64& owner, const UInt64& timeout, bool& condition) { - if (!sem) return false; + //if (!sem) return false; if (!rtl_sem_is_valid(sem, owner)) { return false; diff --git a/src/kernel/src/HeapMgr.cpp b/src/kernel/src/HeapMgr.cpp index a7430824..eea230e1 100644 --- a/src/kernel/src/HeapMgr.cpp +++ b/src/kernel/src/HeapMgr.cpp @@ -28,6 +28,8 @@ #define kHeapMgrMagic (0xD4D75) #define kHeapMgrAlignSz (4U) +#define kHeapMgrSpinMax (255'000) + namespace Kernel { /// @brief Implementation details. @@ -63,8 +65,8 @@ namespace Detail { }; /// @brief Check for heap address validity. - /// @param heap_ptr The address_ptr to check. /// @return Bool if the pointer is valid or not. + /// @param heap_ptr The address_ptr to check. _Output auto mm_check_ptr_address(VoidPtr heap_ptr) -> Bool { if (!heap_ptr) return false; @@ -85,7 +87,7 @@ STATIC PageMgr kPageMgr; /// @return The newly allocated pointer. _Output VoidPtr mm_alloc_ptr(SizeT sz, Bool wr, Bool user, SizeT pad_amount) { static Bool locked = false; - LockDelegate<255> lock{&locked}; + LockDelegate<kHeapMgrSpinMax> lock{&locked}; auto sz_fix = sz; @@ -101,11 +103,6 @@ _Output VoidPtr mm_alloc_ptr(SizeT sz, Bool wr, Bool user, SizeT pad_amount) { reinterpret_cast<Detail::MM_INFORMATION_BLOCK_PTR>(wrapper.VirtualAddress() + sizeof(Detail::MM_INFORMATION_BLOCK)); - if (!heap_info_ptr) { - locked = false; - return nullptr; - } - heap_info_ptr->fSize = sz_fix; heap_info_ptr->fMagic = kHeapMgrMagic; heap_info_ptr->fCRC32 = 0U; // dont fill it for now. |