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

(PSP) Add thread support

This commit is contained in:
twinaphex 2017-12-26 09:45:45 +01:00
parent d3fd5f25d5
commit 08d9ee9600
4 changed files with 5 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.psp1
View File

@ -4,7 +4,7 @@ DEBUG = 0
HAVE_KERNEL_PRX = 1 HAVE_KERNEL_PRX = 1
HAVE_LOGGER = 0 HAVE_LOGGER = 0
HAVE_FILE_LOGGER = 0 HAVE_FILE_LOGGER = 0
HAVE_THREADS = 0 HAVE_THREADS = 1
BIG_STACK = 0 BIG_STACK = 0
WHOLE_ARCHIVE_LINK = 0 WHOLE_ARCHIVE_LINK = 0
@ -33,6 +33,7 @@ LIBS = $(WHOLE_START) -lretro_psp1 $(WHOLE_END) -lstdc++ -lpspgu -lpspgum -lm -l
ifeq ($(HAVE_THREADS), 1) ifeq ($(HAVE_THREADS), 1)
RARCH_DEFINES += -DHAVE_THREADS RARCH_DEFINES += -DHAVE_THREADS
LIBS += -lpthread-psp
endif endif
ifeq ($(HAVE_FILE_LOGGER), 1) ifeq ($(HAVE_FILE_LOGGER), 1)

5
frontend/drivers/platform_psp.c
View File

@ -26,7 +26,6 @@
#include <psp2/power.h> #include <psp2/power.h>
#include <psp2/sysmodule.h> #include <psp2/sysmodule.h>
#include <psp2/appmgr.h> #include <psp2/appmgr.h>
#include <pthread.h>
#include "../../bootstrap/vita/sbrk.c" #include "../../bootstrap/vita/sbrk.c"
#include "../../bootstrap/vita/threading.c" #include "../../bootstrap/vita/threading.c"
@ -39,6 +38,8 @@
#include <pspsdk.h> #include <pspsdk.h>
#endif #endif
#include <pthread.h>
#include <string/stdstring.h> #include <string/stdstring.h>
#include <boolean.h> #include <boolean.h>
#include <file/file_path.h> #include <file/file_path.h>
@ -288,7 +289,6 @@ static void frontend_psp_init(void *data)
#ifdef VITA #ifdef VITA
scePowerSetArmClockFrequency(444); scePowerSetArmClockFrequency(444);
sceSysmoduleLoadModule(SCE_SYSMODULE_NET); sceSysmoduleLoadModule(SCE_SYSMODULE_NET);
pthread_init();
#else #else
(void)data; (void)data;
/* initialize debug screen */ /* initialize debug screen */
@ -300,6 +300,7 @@ static void frontend_psp_init(void *data)
pspFpuSetEnable(0); /* disable FPU exceptions */ pspFpuSetEnable(0); /* disable FPU exceptions */
scePowerSetClockFrequency(333,333,166); scePowerSetClockFrequency(333,333,166);
#endif #endif
pthread_init();
#endif #endif

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

@ -1,309 +0,0 @@
/* Copyright (C) 2010-2017 The RetroArch team
*
* ---------------------------------------------------------------------------------------
* The following license statement only applies to this file (psp_pthread.h).
* ---------------------------------------------------------------------------------------
*
* Permission is hereby granted, free of charge,
* to any person obtaining a copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
* and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
/* FIXME: unfinished on PSP, mutexes and condition variables basically a stub. */
#ifndef _PSP_PTHREAD_WRAP__
#define _PSP_PTHREAD_WRAP__
#ifdef VITA
#include <psp2/kernel/threadmgr.h>
#include <sys/time.h>
#else
#include <pspkernel.h>
#include <pspthreadman.h>
#include <pspthreadman_kernel.h>
#endif
#include <stdio.h>
#include <retro_inline.h>
#define STACKSIZE (8 * 1024)
typedef SceUID pthread_t;
typedef SceUID pthread_mutex_t;
typedef void* pthread_mutexattr_t;
typedef int pthread_attr_t;
typedef struct
{
SceUID mutex;
SceUID sema;
int waiting;
} pthread_cond_t;
typedef SceUID pthread_condattr_t;
/* Use pointer values to create unique names for threads/mutexes */
char name_buffer[256];
typedef void* (*sthreadEntry)(void *argp);
typedef struct
{
void* arg;
sthreadEntry start_routine;
} sthread_args_struct;
static int psp_thread_wrap(SceSize args, void *argp)
{
sthread_args_struct* sthread_args = (sthread_args_struct*)argp;
return (int)sthread_args->start_routine(sthread_args->arg);
}
static INLINE int pthread_create(pthread_t *thread,
const pthread_attr_t *attr, void *(*start_routine)(void*), void *arg)
{
snprintf(name_buffer, sizeof(name_buffer), "0x%08X", (unsigned int) thread);
#ifdef VITA
*thread = sceKernelCreateThread(name_buffer, psp_thread_wrap,
0x10000100, 0x10000, 0, 0, NULL);
#else
*thread = sceKernelCreateThread(name_buffer,
psp_thread_wrap, 0x20, STACKSIZE, 0, NULL);
#endif
sthread_args_struct sthread_args;
sthread_args.arg = arg;
sthread_args.start_routine = start_routine;
return sceKernelStartThread(*thread, sizeof(sthread_args), &sthread_args);
}
static INLINE int pthread_mutex_init(pthread_mutex_t *mutex,
const pthread_mutexattr_t *attr)
{
snprintf(name_buffer, sizeof(name_buffer), "0x%08X", (unsigned int) mutex);
#ifdef VITA
*mutex = sceKernelCreateMutex(name_buffer, 0, 0, 0);
if(*mutex<0)
return *mutex;
return 0;
#else
return *mutex = sceKernelCreateSema(name_buffer, 0, 1, 1, NULL);
#endif
}
static INLINE int pthread_mutex_destroy(pthread_mutex_t *mutex)
{
#ifdef VITA
return sceKernelDeleteMutex(*mutex);
#else
return sceKernelDeleteSema(*mutex);
#endif
}
static INLINE int pthread_mutex_lock(pthread_mutex_t *mutex)
{
#ifdef VITA
int ret = sceKernelLockMutex(*mutex, 1, 0);
return ret;
#else
/* FIXME: stub */
return 1;
#endif
}
static INLINE int pthread_mutex_unlock(pthread_mutex_t *mutex)
{
#ifdef VITA
int ret = sceKernelUnlockMutex(*mutex, 1);
return ret;
#else
/* FIXME: stub */
return 1;
#endif
}
static INLINE int pthread_join(pthread_t thread, void **retval)
{
#ifdef VITA
int res = sceKernelWaitThreadEnd(thread, 0, 0);
if (res < 0)
return res;
return sceKernelDeleteThread(thread);
#else
SceUInt timeout = (SceUInt)-1;
sceKernelWaitThreadEnd(thread, &timeout);
exit_status = sceKernelGetThreadExitStatus(thread);
sceKernelDeleteThread(thread);
return exit_status;
#endif
}
static INLINE int pthread_mutex_trylock(pthread_mutex_t *mutex)
{
#ifdef VITA
return sceKernelTryLockMutex(*mutex, 1 /* not sure about this last param */);
#else
/* FIXME: stub */
return 1;
#endif
}
static INLINE int pthread_cond_wait(pthread_cond_t *cond,
pthread_mutex_t *mutex)
{
#ifdef VITA
int ret = pthread_mutex_lock(&cond->mutex);
if (ret < 0)
return ret;
++cond->waiting;
pthread_mutex_unlock(mutex);
pthread_mutex_unlock(&cond->mutex);
ret = sceKernelWaitSema(cond->sema, 1, 0);
if (ret < 0)
sceClibPrintf("Premature wakeup: %08X", ret);
pthread_mutex_lock(mutex);
return ret;
#else
/* FIXME: stub */
sceKernelDelayThread(10000);
return 1;
#endif
}
static INLINE int pthread_cond_timedwait(pthread_cond_t *cond,
pthread_mutex_t *mutex, const struct timespec *abstime)
{
#ifdef VITA
int ret = pthread_mutex_lock(&cond->mutex);
if (ret < 0)
return ret;
++cond->waiting;
pthread_mutex_unlock(mutex);
pthread_mutex_unlock(&cond->mutex);
SceUInt timeout = 0;
timeout = abstime->tv_sec;
timeout += abstime->tv_nsec / 1.0e6;
ret = sceKernelWaitSema(cond->sema, 1, &timeout);
if (ret < 0)
sceClibPrintf("Premature wakeup: %08X", ret);
pthread_mutex_lock(mutex);
return ret;
#else
/* FIXME: stub */
return 1;
#endif
}
static INLINE int pthread_cond_init(pthread_cond_t *cond,
const pthread_condattr_t *attr)
{
#ifdef VITA
pthread_mutex_init(&cond->mutex,NULL);
if(cond->mutex<0)
return cond->mutex;
snprintf(name_buffer, sizeof(name_buffer), "0x%08X", (unsigned int) cond);
cond->sema = sceKernelCreateSema(name_buffer, 0, 0, 1, 0);
if(cond->sema < 0)
{
pthread_mutex_destroy(&cond->mutex);
return cond->sema;
}
cond->waiting = 0;
return 0;
#else
/* FIXME: stub */
return 1;
#endif
}
static INLINE int pthread_cond_signal(pthread_cond_t *cond)
{
#ifdef VITA
pthread_mutex_lock(&cond->mutex);
if (cond->waiting)
{
--cond->waiting;
sceKernelSignalSema(cond->sema, 1);
}
pthread_mutex_unlock(&cond->mutex);
return 0;
#else
/* FIXME: stub */
return 1;
#endif
}
static INLINE int pthread_cond_broadcast(pthread_cond_t *cond)
{
/* FIXME: stub */
return 1;
}
static INLINE int pthread_cond_destroy(pthread_cond_t *cond)
{
#ifdef VITA
int ret = sceKernelDeleteSema(cond->sema);
if(ret < 0)
return ret;
return sceKernelDeleteMutex(cond->mutex);
#else
/* FIXME: stub */
return 1;
#endif
}
static INLINE int pthread_detach(pthread_t thread)
{
return 0;
}
static INLINE void pthread_exit(void *retval)
{
#ifdef VITA
sceKernelExitDeleteThread(sceKernelGetThreadId());
#endif
}
static INLINE pthread_t pthread_self(void)
{
/* zero 20-mar-2016: untested */
return sceKernelGetThreadId();
}
static INLINE int pthread_equal(pthread_t t1, pthread_t t2)
{
return t1 == t2;
}
#endif //_PSP_PTHREAD_WRAP__

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

@ -45,8 +45,6 @@
#endif #endif
#elif defined(GEKKO) #elif defined(GEKKO)
#include "gx_pthread.h" #include "gx_pthread.h"
#elif defined(PSP)
#include "psp_pthread.h"
#elif defined(__CELLOS_LV2__) #elif defined(__CELLOS_LV2__)
#include <pthread.h> #include <pthread.h>
#include <sys/sys_time.h> #include <sys/sys_time.h>