ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(VITA) Let's use SDK pthreads

This commit is contained in:
frangarcj 2016-09-08 16:11:16 +02:00 committed by Francisco José García García
parent 4197d81dcf
commit c3bf05de96
3 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.griffin
View File

@ -378,6 +378,9 @@ CFLAGS += -DHAVE_THREADS
ifeq ($(platform), psp1) ifeq ($(platform), psp1)
LIBS += -lpthread-psp LIBS += -lpthread-psp
endif endif
ifeq ($(platform), vita)
LIBS += -lpthread
endif
endif endif
ifeq ($(HAVE_RSOUND), 1) ifeq ($(HAVE_RSOUND), 1)

8
libretro-common/rthreads/psp_pthread.h
View File

@ -73,7 +73,7 @@ static int psp_thread_wrap(SceSize args, void *argp)
static INLINE int pthread_create(pthread_t *thread, static INLINE int pthread_create(pthread_t *thread,
const pthread_attr_t *attr, void *(*start_routine)(void*), void *arg) const pthread_attr_t *attr, void *(*start_routine)(void*), void *arg)
{ {
sprintf(name_buffer, "0x%08X", (uint32_t) thread); sprintf(name_buffer, "0x%08X", (unsigned int) thread);
#ifdef VITA #ifdef VITA
*thread = sceKernelCreateThread(name_buffer, psp_thread_wrap, *thread = sceKernelCreateThread(name_buffer, psp_thread_wrap,
@ -93,7 +93,7 @@ static INLINE int pthread_create(pthread_t *thread,
static INLINE int pthread_mutex_init(pthread_mutex_t *mutex, static INLINE int pthread_mutex_init(pthread_mutex_t *mutex,
const pthread_mutexattr_t *attr) const pthread_mutexattr_t *attr)
{ {
sprintf(name_buffer, "0x%08X", (uint32_t) mutex); sprintf(name_buffer, "0x%08X", (unsigned int) mutex);
#ifdef VITA #ifdef VITA
*mutex = sceKernelCreateMutex(name_buffer, 0, 0, 0); *mutex = sceKernelCreateMutex(name_buffer, 0, 0, 0);
@ -224,7 +224,7 @@ static INLINE int pthread_cond_init(pthread_cond_t *cond,
if(cond->mutex<0){ if(cond->mutex<0){
return cond->mutex; return cond->mutex;
} }
sprintf(name_buffer, "0x%08X", (uint32_t) cond); sprintf(name_buffer, "0x%08X", (unsigned int) cond);
//cond->sema = sceKernelCreateCond(name_buffer, 0, cond->mutex, 0); //cond->sema = sceKernelCreateCond(name_buffer, 0, cond->mutex, 0);
cond->sema = sceKernelCreateSema(name_buffer, 0, 0, 1, 0); cond->sema = sceKernelCreateSema(name_buffer, 0, 0, 1, 0);
if(cond->sema<0){ if(cond->sema<0){
@ -251,7 +251,7 @@ static INLINE int pthread_cond_signal(pthread_cond_t *cond)
if (cond->waiting) if (cond->waiting)
{ {
--cond->waiting; --cond->waiting;
int ret = sceKernelSignalSema(cond->sema, 1); sceKernelSignalSema(cond->sema, 1);
} }
pthread_mutex_unlock(&cond->mutex); pthread_mutex_unlock(&cond->mutex);
return 0; return 0;

44
libretro-common/rthreads/rthreads.c
View File

@ -41,7 +41,7 @@
#endif #endif
#elif defined(GEKKO) #elif defined(GEKKO)
#include "gx_pthread.h" #include "gx_pthread.h"
#elif defined(PSP) || defined(VITA) #elif defined(PSP)
#include "psp_pthread.h" #include "psp_pthread.h"
#elif defined(__CELLOS_LV2__) #elif defined(__CELLOS_LV2__)
#include <pthread.h> #include <pthread.h>
@ -154,11 +154,11 @@ error:
/** /**
* sthread_detach: * sthread_detach:
* @thread : pointer to thread object * @thread : pointer to thread object
* *
* Detach a thread. When a detached thread terminates, its * Detach a thread. When a detached thread terminates, its
* resource sare automatically released back to the system * resource sare automatically released back to the system
* without the need for another thread to join with the * without the need for another thread to join with the
* terminated thread. * terminated thread.
* *
* Returns: 0 on success, otherwise it returns a non-zero error number. * Returns: 0 on success, otherwise it returns a non-zero error number.
@ -176,13 +176,13 @@ int sthread_detach(sthread_t *thread)
/** /**
* sthread_join: * sthread_join:
* @thread : pointer to thread object * @thread : pointer to thread object
* *
* Join with a terminated thread. Waits for the thread specified by * Join with a terminated thread. Waits for the thread specified by
* @thread to terminate. If that thread has already terminated, then * @thread to terminate. If that thread has already terminated, then
* it will return immediately. The thread specified by @thread must * it will return immediately. The thread specified by @thread must
* be joinable. * be joinable.
* *
* Returns: 0 on success, otherwise it returns a non-zero error number. * Returns: 0 on success, otherwise it returns a non-zero error number.
*/ */
void sthread_join(sthread_t *thread) void sthread_join(sthread_t *thread)
@ -198,13 +198,13 @@ void sthread_join(sthread_t *thread)
/** /**
* sthread_isself: * sthread_isself:
* @thread : pointer to thread object * @thread : pointer to thread object
* *
* Join with a terminated thread. Waits for the thread specified by * Join with a terminated thread. Waits for the thread specified by
* @thread to terminate. If that thread has already terminated, then * @thread to terminate. If that thread has already terminated, then
* it will return immediately. The thread specified by @thread must * it will return immediately. The thread specified by @thread must
* be joinable. * be joinable.
* *
* Returns: true (1) if calling thread is the specified thread * Returns: true (1) if calling thread is the specified thread
*/ */
bool sthread_isself(sthread_t *thread) bool sthread_isself(sthread_t *thread)
@ -248,7 +248,7 @@ error:
/** /**
* slock_free: * slock_free:
* @lock : pointer to mutex object * @lock : pointer to mutex object
* *
* Frees a mutex. * Frees a mutex.
**/ **/
@ -267,7 +267,7 @@ void slock_free(slock_t *lock)
/** /**
* slock_lock: * slock_lock:
* @lock : pointer to mutex object * @lock : pointer to mutex object
* *
* Locks a mutex. If a mutex is already locked by * Locks a mutex. If a mutex is already locked by
* another thread, the calling thread shall block until * another thread, the calling thread shall block until
@ -284,7 +284,7 @@ void slock_lock(slock_t *lock)
/** /**
* slock_unlock: * slock_unlock:
* @lock : pointer to mutex object * @lock : pointer to mutex object
* *
* Unlocks a mutex. * Unlocks a mutex.
**/ **/
@ -333,7 +333,7 @@ error:
/** /**
* scond_free: * scond_free:
* @cond : pointer to condition variable object * @cond : pointer to condition variable object
* *
* Frees a condition variable. * Frees a condition variable.
**/ **/
@ -352,16 +352,16 @@ void scond_free(scond_t *cond)
/** /**
* scond_wait: * scond_wait:
* @cond : pointer to condition variable object * @cond : pointer to condition variable object
* @lock : pointer to mutex object * @lock : pointer to mutex object
* *
* Block on a condition variable (i.e. wait on a condition). * Block on a condition variable (i.e. wait on a condition).
**/ **/
void scond_wait(scond_t *cond, slock_t *lock) void scond_wait(scond_t *cond, slock_t *lock)
{ {
#ifdef USE_WIN32_THREADS #ifdef USE_WIN32_THREADS
WaitForSingleObject(cond->event, 0); WaitForSingleObject(cond->event, 0);
SignalObjectAndWait(lock->lock, cond->event, INFINITE, FALSE); SignalObjectAndWait(lock->lock, cond->event, INFINITE, FALSE);
slock_lock(lock); slock_lock(lock);
#else #else
@ -371,15 +371,15 @@ void scond_wait(scond_t *cond, slock_t *lock)
/** /**
* scond_broadcast: * scond_broadcast:
* @cond : pointer to condition variable object * @cond : pointer to condition variable object
* *
* Broadcast a condition. Unblocks all threads currently blocked * Broadcast a condition. Unblocks all threads currently blocked
* on the specified condition variable @cond. * on the specified condition variable @cond.
**/ **/
int scond_broadcast(scond_t *cond) int scond_broadcast(scond_t *cond)
{ {
#ifdef USE_WIN32_THREADS #ifdef USE_WIN32_THREADS
/* FIXME _- check how this function should differ /* FIXME _- check how this function should differ
* from scond_signal implementation. */ * from scond_signal implementation. */
SetEvent(cond->event); SetEvent(cond->event);
return 0; return 0;
@ -390,10 +390,10 @@ int scond_broadcast(scond_t *cond)
/** /**
* scond_signal: * scond_signal:
* @cond : pointer to condition variable object * @cond : pointer to condition variable object
* *
* Signal a condition. Unblocks at least one of the threads currently blocked * Signal a condition. Unblocks at least one of the threads currently blocked
* on the specified condition variable @cond. * on the specified condition variable @cond.
**/ **/
void scond_signal(scond_t *cond) void scond_signal(scond_t *cond)
{ {
@ -406,8 +406,8 @@ void scond_signal(scond_t *cond)
/** /**
* scond_wait_timeout: * scond_wait_timeout:
* @cond : pointer to condition variable object * @cond : pointer to condition variable object
* @lock : pointer to mutex object * @lock : pointer to mutex object
* @timeout_us : timeout (in microseconds) * @timeout_us : timeout (in microseconds)
* *
* Try to block on a condition variable (i.e. wait on a condition) until * Try to block on a condition variable (i.e. wait on a condition) until