External/pspsdk
1
0
Fork 0
mirror of https://github.com/pspdev/pspsdk.git synced 2025-10-04 01:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pthread priorities and timeout

Browse Source
This commit is contained in:
Francisco Javier Trujillo Mata
2024-04-03 23:56:32 +02:00
parent 5c6cc731e3
commit 3615791863
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/libpthreadglue/osal.c
View File

@@ -180,6 +180,12 @@ pte_osResult pte_osTerminate(void) {
* Threads * Threads
* *
***************************************************************************/ ***************************************************************************/
static inline int invert_priority(int priority)
{
return (pte_osThreadGetMinPriority() - priority) + pte_osThreadGetMaxPriority();
}
#ifdef F_pte_osThreadCreate #ifdef F_pte_osThreadCreate
pte_osResult pte_osThreadCreate(pte_osThreadEntryPoint entryPoint, pte_osResult pte_osThreadCreate(pte_osThreadEntryPoint entryPoint,
int stackSize, int stackSize,
@@ -255,7 +261,7 @@ pte_osResult pte_osThreadCreate(pte_osThreadEntryPoint entryPoint,
// printf("%s %p %d %d %d\n",threadName, __pspStubThreadEntry, initialPriority, stackSize, pspAttr); // printf("%s %p %d %d %d\n",threadName, __pspStubThreadEntry, initialPriority, stackSize, pspAttr);
threadId = sceKernelCreateThread(threadName, threadId = sceKernelCreateThread(threadName,
__pspStubThreadEntry, __pspStubThreadEntry,
initialPriority, invert_priority(initialPriority),
stackSize, stackSize,
pspAttr, pspAttr,
NULL); NULL);
@@ -399,14 +405,14 @@ int pte_osThreadGetPriority(pte_osThreadHandle threadHandle)
thinfo.size = sizeof(thinfo); thinfo.size = sizeof(thinfo);
sceKernelReferThreadStatus(threadHandle, &thinfo); sceKernelReferThreadStatus(threadHandle, &thinfo);
return thinfo.currentPriority; return invert_priority(thinfo.currentPriority);
} }
#endif #endif
#ifdef F_pte_osThreadSetPriority #ifdef F_pte_osThreadSetPriority
pte_osResult pte_osThreadSetPriority(pte_osThreadHandle threadHandle, int newPriority) pte_osResult pte_osThreadSetPriority(pte_osThreadHandle threadHandle, int newPriority)
{ {
sceKernelChangeThreadPriority(threadHandle, newPriority); sceKernelChangeThreadPriority(threadHandle, invert_priority(newPriority));
return PTE_OS_OK; return PTE_OS_OK;
} }
#endif #endif
@@ -475,21 +481,21 @@ void pte_osThreadSleep(unsigned int msecs)
#ifdef F_pte_osThreadGetMinPriority #ifdef F_pte_osThreadGetMinPriority
int pte_osThreadGetMinPriority() int pte_osThreadGetMinPriority()
{ {
return 17; return pte_osThreadGetDefaultPriority() - 32;
} }
#endif #endif
#ifdef F_pte_osThreadGetMaxPriority #ifdef F_pte_osThreadGetMaxPriority
int pte_osThreadGetMaxPriority() int pte_osThreadGetMaxPriority()
{ {
return 30; return pte_osThreadGetDefaultPriority() + 32;
} }
#endif #endif
#ifdef F_pte_osThreadGetDefaultPriority #ifdef F_pte_osThreadGetDefaultPriority
int pte_osThreadGetDefaultPriority() int pte_osThreadGetDefaultPriority()
{ {
return 18; return 60;
} }
#endif #endif
@@ -621,7 +627,7 @@ pte_osResult pte_osSemaphorePend(pte_osSemaphoreHandle handle, unsigned int *pTi
{ {
unsigned int timeoutUsecs; unsigned int timeoutUsecs;
unsigned int *pTimeoutUsecs; unsigned int *pTimeoutUsecs;
SceUInt result; int result;
pte_osResult osResult; pte_osResult osResult;
if (pTimeoutMsecs == NULL) { if (pTimeoutMsecs == NULL) {
@@ -661,17 +667,14 @@ pte_osResult pte_osSemaphoreCancellablePend(pte_osSemaphoreHandle semHandle, uns
clock_t start_time; clock_t start_time;
pte_osResult result = PTE_OS_OK; pte_osResult result = PTE_OS_OK;
unsigned int timeout; unsigned int timeout;
unsigned char timeoutEnabled;
start_time = clock(); start_time = clock();
// clock() is in microseconds, timeout as passed in was in milliseconds // clock() is in microseconds, timeout as passed in was in milliseconds
if (pTimeout == NULL) { if (pTimeout == NULL) {
timeout = 0; timeout = 0;
timeoutEnabled = 0;
} else { } else {
timeout = *pTimeout * 1000; timeout = *pTimeout * 1000;
timeoutEnabled = 1;
} }
while (1) { while (1) {
@@ -686,7 +689,7 @@ pte_osResult pte_osSemaphoreCancellablePend(pte_osSemaphoreHandle semHandle, uns
/* User semaphore posted to */ /* User semaphore posted to */
result = PTE_OS_OK; result = PTE_OS_OK;
break; break;
} else if ((timeoutEnabled) && ((clock() - start_time) > timeout)) { } else if ((pTimeout) && ((clock() - start_time) > timeout)) {
/* Timeout expired */ /* Timeout expired */
result = PTE_OS_TIMEOUT; result = PTE_OS_TIMEOUT;
break; break;