From a98b184f56c4036eed6c0cfe298d9b90b9589f07 Mon Sep 17 00:00:00 2001 From: Naomino <66085784+Naomi-Kali@users.noreply.github.com> Date: Sun, 7 Jul 2024 16:57:11 +0200 Subject: [PATCH] Revert "Thread_management rework" This reverts commit a5b3967fd2dbb0b280d2e11b4ced0acc1269d3df. --- src/core/libraries/kernel/thread_management.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/core/libraries/kernel/thread_management.cpp b/src/core/libraries/kernel/thread_management.cpp index 94e39ffaf..3f6f9bd6a 100644 --- a/src/core/libraries/kernel/thread_management.cpp +++ b/src/core/libraries/kernel/thread_management.cpp @@ -323,7 +323,6 @@ int PS4_SYSV_ABI scePthreadAttrGetstackaddr(const ScePthreadAttr* attr, void** s return result == 0 ? SCE_OK : SCE_KERNEL_ERROR_EINVAL; } - int PS4_SYSV_ABI scePthreadAttrGetstacksize(const ScePthreadAttr* attr, size_t* stack_size) { if (stack_size == nullptr || attr == nullptr || *attr == nullptr) { @@ -335,7 +334,6 @@ int PS4_SYSV_ABI scePthreadAttrGetstacksize(const ScePthreadAttr* attr, size_t* return result == 0 ? SCE_OK : SCE_KERNEL_ERROR_EINVAL; } -/* int PS4_SYSV_ABI scePthreadAttrSetstackaddr(ScePthreadAttr* attr, void* addr) { if (addr == nullptr || attr == nullptr || *attr == nullptr) { @@ -345,18 +343,6 @@ int PS4_SYSV_ABI scePthreadAttrSetstackaddr(ScePthreadAttr* attr, void* addr) { int result = pthread_attr_setstackaddr(&(*attr)->pth_attr, addr); return result == 0 ? SCE_OK : SCE_KERNEL_ERROR_EINVAL; -}*/ -int PS4_SYSV_ABI scePthreadAttrSetstackaddr(ScePthreadAttr* attr, void* stack_addr, size_t stack_size) { - if (attr == nullptr || *attr == nullptr || stack_addr == nullptr) { - return SCE_KERNEL_ERROR_EINVAL; - } - - int result = pthread_attr_setstack(&(*attr)->pth_attr, stack_addr, stack_size); - if (result != 0) { - return SCE_KERNEL_ERROR_EINVAL; - } - - return SCE_OK; } int PS4_SYSV_ABI scePthreadAttrSetstacksize(ScePthreadAttr* attr, size_t stack_size) { @@ -911,7 +897,7 @@ static int pthread_copy_attributes(ScePthreadAttr* dst, const ScePthreadAttr* sr result = (result == 0 ? scePthreadAttrSetschedparam(dst, ¶m) : result); result = (result == 0 ? scePthreadAttrSetschedpolicy(dst, policy) : result); if (stack_addr != nullptr) { - result = (result == 0 ? scePthreadAttrSetstackaddr(dst, stack_addr, stack_size) : result); + result = (result == 0 ? scePthreadAttrSetstackaddr(dst, stack_addr) : result); } if (stack_size != 0) { result = (result == 0 ? scePthreadAttrSetstacksize(dst, stack_size) : result);