mirror of
https://github.com/libretro/RetroArch
synced 2025-03-02 19:13:34 +00:00
Refactor rthreads.c
This commit is contained in:
twinaphex
parent
90722b645e
commit
cc48325ed9
@ -50,14 +50,38 @@ struct thread_data
|
||||
void *userdata;
|
||||
};
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
struct sthread
|
||||
{
|
||||
#ifdef _WIN32
|
||||
HANDLE thread;
|
||||
#else
|
||||
pthread_t id;
|
||||
#endif
|
||||
};
|
||||
|
||||
struct slock
|
||||
{
|
||||
#ifdef _WIN32
|
||||
HANDLE lock;
|
||||
#else
|
||||
pthread_mutex_t lock;
|
||||
#endif
|
||||
};
|
||||
|
||||
struct scond
|
||||
{
|
||||
#ifdef _WIN32
|
||||
HANDLE event;
|
||||
#else
|
||||
pthread_cond_t cond;
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifdef _WIN32
|
||||
static DWORD CALLBACK thread_wrap(void *data_)
|
||||
#else
|
||||
static void *thread_wrap(void *data_)
|
||||
#endif
|
||||
{
|
||||
struct thread_data *data = (struct thread_data*)data_;
|
||||
data->func(data->userdata);
|
||||
@ -81,8 +105,12 @@ sthread_t *sthread_create(void (*thread_func)(void*), void *userdata)
|
||||
data->func = thread_func;
|
||||
data->userdata = userdata;
|
||||
|
||||
#ifdef _WIN32
|
||||
thread->thread = CreateThread(NULL, 0, thread_wrap, data, 0, NULL);
|
||||
if (!thread->thread)
|
||||
#else
|
||||
if (pthread_create(&thread->id, NULL, thread_wrap, data) < 0)
|
||||
#endif
|
||||
{
|
||||
free(data);
|
||||
free(thread);
|
||||
@ -94,35 +122,43 @@ sthread_t *sthread_create(void (*thread_func)(void*), void *userdata)
|
||||
|
||||
int sthread_detach(sthread_t *thread)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
CloseHandle(thread->thread);
|
||||
free(thread);
|
||||
return 0;
|
||||
#else
|
||||
return pthread_detach(thread->id);
|
||||
#endif
|
||||
}
|
||||
|
||||
void sthread_join(sthread_t *thread)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
WaitForSingleObject(thread->thread, INFINITE);
|
||||
CloseHandle(thread->thread);
|
||||
#else
|
||||
pthread_join(thread->id, NULL);
|
||||
#endif
|
||||
free(thread);
|
||||
}
|
||||
|
||||
struct slock
|
||||
{
|
||||
HANDLE lock;
|
||||
};
|
||||
|
||||
slock_t *slock_new(void)
|
||||
{
|
||||
slock_t *lock = (slock_t*)calloc(1, sizeof(*lock));
|
||||
if (!lock)
|
||||
return NULL;
|
||||
|
||||
#ifdef _WIN32
|
||||
lock->lock = CreateMutex(NULL, FALSE, "RetroArchMutex");
|
||||
if (!lock->lock)
|
||||
#else
|
||||
if (pthread_mutex_init(&lock->lock, NULL) < 0)
|
||||
#endif
|
||||
{
|
||||
free(lock);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return lock;
|
||||
}
|
||||
|
||||
@ -131,33 +167,44 @@ void slock_free(slock_t *lock)
|
||||
if (!lock)
|
||||
return;
|
||||
|
||||
#ifdef _WIN32
|
||||
CloseHandle(lock->lock);
|
||||
#else
|
||||
pthread_mutex_destroy(&lock->lock);
|
||||
#endif
|
||||
free(lock);
|
||||
}
|
||||
|
||||
void slock_lock(slock_t *lock)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
WaitForSingleObject(lock->lock, INFINITE);
|
||||
#else
|
||||
pthread_mutex_lock(&lock->lock);
|
||||
#endif
|
||||
}
|
||||
|
||||
void slock_unlock(slock_t *lock)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
ReleaseMutex(lock->lock);
|
||||
#else
|
||||
pthread_mutex_unlock(&lock->lock);
|
||||
#endif
|
||||
}
|
||||
|
||||
struct scond
|
||||
{
|
||||
HANDLE event;
|
||||
};
|
||||
|
||||
scond_t *scond_new(void)
|
||||
{
|
||||
scond_t *cond = (scond_t*)calloc(1, sizeof(*cond));
|
||||
if (!cond)
|
||||
return NULL;
|
||||
|
||||
#ifdef _WIN32
|
||||
cond->event = CreateEvent(NULL, FALSE, FALSE, NULL);
|
||||
if (!cond->event)
|
||||
#else
|
||||
if (pthread_cond_init(&cond->cond, NULL) < 0)
|
||||
#endif
|
||||
{
|
||||
free(cond);
|
||||
return NULL;
|
||||
@ -166,195 +213,83 @@ scond_t *scond_new(void)
|
||||
return cond;
|
||||
}
|
||||
|
||||
void scond_free(scond_t *cond)
|
||||
{
|
||||
if (!cond)
|
||||
return;
|
||||
|
||||
#ifdef _WIN32
|
||||
CloseHandle(cond->event);
|
||||
#else
|
||||
pthread_cond_destroy(&cond->cond);
|
||||
#endif
|
||||
free(cond);
|
||||
}
|
||||
|
||||
void scond_wait(scond_t *cond, slock_t *lock)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
WaitForSingleObject(cond->event, 0);
|
||||
|
||||
|
||||
#if MSC_VER <= 1310
|
||||
slock_unlock(lock);
|
||||
WaitForSingleObject(cond->event, INFINITE);
|
||||
#else
|
||||
SignalObjectAndWait(lock->lock, cond->event, INFINITE, FALSE);
|
||||
#endif
|
||||
|
||||
slock_lock(lock);
|
||||
#else
|
||||
pthread_cond_wait(&cond->cond, &lock->lock);
|
||||
#endif
|
||||
}
|
||||
|
||||
bool scond_wait_timeout(scond_t *cond, slock_t *lock, int64_t timeout_us)
|
||||
{
|
||||
WaitForSingleObject(cond->event, 0);
|
||||
#if MSC_VER <= 1310
|
||||
slock_unlock(lock);
|
||||
DWORD res = WaitForSingleObject(cond->event, (DWORD)(timeout_us) / 1000);
|
||||
#else
|
||||
DWORD res = SignalObjectAndWait(lock->lock, cond->event,
|
||||
(DWORD)(timeout_us) / 1000, FALSE);
|
||||
#endif
|
||||
/* FIXME _WIN32 - check how this function should differ
|
||||
* from scond_signal implementation. */
|
||||
|
||||
slock_lock(lock);
|
||||
return res == WAIT_OBJECT_0;
|
||||
int scond_broadcast(scond_t *cond)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
SetEvent(cond->event);
|
||||
return 0;
|
||||
#else
|
||||
return pthread_cond_broadcast(&cond->cond);
|
||||
#endif
|
||||
}
|
||||
|
||||
void scond_signal(scond_t *cond)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
SetEvent(cond->event);
|
||||
}
|
||||
|
||||
/* FIXME - check how this function should differ
|
||||
* from scond_signal implementation. */
|
||||
int scond_broadcast(scond_t *cond)
|
||||
{
|
||||
SetEvent(cond->event);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void scond_free(scond_t *cond)
|
||||
{
|
||||
if (!cond)
|
||||
return;
|
||||
|
||||
CloseHandle(cond->event);
|
||||
free(cond);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
struct sthread
|
||||
{
|
||||
pthread_t id;
|
||||
};
|
||||
|
||||
static void *thread_wrap(void *data_)
|
||||
{
|
||||
struct thread_data *data = (struct thread_data*)data_;
|
||||
data->func(data->userdata);
|
||||
free(data);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
sthread_t *sthread_create(void (*thread_func)(void*), void *userdata)
|
||||
{
|
||||
sthread_t *thr = (sthread_t*)calloc(1, sizeof(*thr));
|
||||
if (!thr)
|
||||
return NULL;
|
||||
|
||||
struct thread_data *data = (struct thread_data*)calloc(1, sizeof(*data));
|
||||
if (!data)
|
||||
{
|
||||
free(thr);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
data->func = thread_func;
|
||||
data->userdata = userdata;
|
||||
|
||||
if (pthread_create(&thr->id, NULL, thread_wrap, data) < 0)
|
||||
{
|
||||
free(data);
|
||||
free(thr);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return thr;
|
||||
}
|
||||
|
||||
int sthread_detach(sthread_t *thread)
|
||||
{
|
||||
return pthread_detach(thread->id);
|
||||
}
|
||||
|
||||
void sthread_join(sthread_t *thread)
|
||||
{
|
||||
pthread_join(thread->id, NULL);
|
||||
free(thread);
|
||||
}
|
||||
|
||||
struct slock
|
||||
{
|
||||
pthread_mutex_t lock;
|
||||
};
|
||||
|
||||
slock_t *slock_new(void)
|
||||
{
|
||||
slock_t *lock = (slock_t*)calloc(1, sizeof(*lock));
|
||||
if (!lock)
|
||||
return NULL;
|
||||
|
||||
if (pthread_mutex_init(&lock->lock, NULL) < 0)
|
||||
{
|
||||
free(lock);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return lock;
|
||||
}
|
||||
|
||||
void slock_free(slock_t *lock)
|
||||
{
|
||||
if (!lock)
|
||||
return;
|
||||
|
||||
pthread_mutex_destroy(&lock->lock);
|
||||
free(lock);
|
||||
}
|
||||
|
||||
void slock_lock(slock_t *lock)
|
||||
{
|
||||
pthread_mutex_lock(&lock->lock);
|
||||
}
|
||||
|
||||
void slock_unlock(slock_t *lock)
|
||||
{
|
||||
pthread_mutex_unlock(&lock->lock);
|
||||
}
|
||||
|
||||
struct scond
|
||||
{
|
||||
pthread_cond_t cond;
|
||||
};
|
||||
|
||||
scond_t *scond_new(void)
|
||||
{
|
||||
scond_t *cond = (scond_t*)calloc(1, sizeof(*cond));
|
||||
if (!cond)
|
||||
return NULL;
|
||||
|
||||
if (pthread_cond_init(&cond->cond, NULL) < 0)
|
||||
{
|
||||
free(cond);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return cond;
|
||||
}
|
||||
|
||||
void scond_free(scond_t *cond)
|
||||
{
|
||||
if (!cond)
|
||||
return;
|
||||
|
||||
pthread_cond_destroy(&cond->cond);
|
||||
free(cond);
|
||||
}
|
||||
|
||||
void scond_wait(scond_t *cond, slock_t *lock)
|
||||
{
|
||||
pthread_cond_wait(&cond->cond, &lock->lock);
|
||||
}
|
||||
|
||||
int scond_broadcast(scond_t *cond)
|
||||
{
|
||||
return pthread_cond_broadcast(&cond->cond);
|
||||
pthread_cond_signal(&cond->cond);
|
||||
#endif
|
||||
}
|
||||
|
||||
bool scond_wait_timeout(scond_t *cond, slock_t *lock, int64_t timeout_us)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
DWORD ret;
|
||||
|
||||
WaitForSingleObject(cond->event, 0);
|
||||
#if MSC_VER <= 1310
|
||||
slock_unlock(lock);
|
||||
ret = WaitForSingleObject(cond->event, (DWORD)(timeout_us) / 1000);
|
||||
#else
|
||||
ret = SignalObjectAndWait(lock->lock, cond->event,
|
||||
(DWORD)(timeout_us) / 1000, FALSE);
|
||||
#endif
|
||||
|
||||
slock_lock(lock);
|
||||
return ret == WAIT_OBJECT_0;
|
||||
#else
|
||||
int ret;
|
||||
struct timespec now = {0};
|
||||
|
||||
#ifdef __MACH__
|
||||
/* OSX doesn't have clock_gettime. */
|
||||
clock_serv_t cclock;
|
||||
mach_timespec_t mts;
|
||||
|
||||
host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
|
||||
clock_get_time(cclock, &mts);
|
||||
mach_port_deallocate(mach_task_self(), cclock);
|
||||
@ -363,11 +298,13 @@ bool scond_wait_timeout(scond_t *cond, slock_t *lock, int64_t timeout_us)
|
||||
#elif defined(__CELLOS_LV2__)
|
||||
sys_time_sec_t s;
|
||||
sys_time_nsec_t n;
|
||||
|
||||
sys_time_get_current_time(&s, &n);
|
||||
now.tv_sec = s;
|
||||
now.tv_nsec = n;
|
||||
#elif defined(__mips__)
|
||||
struct timeval tm;
|
||||
|
||||
gettimeofday(&tm, NULL);
|
||||
now.tv_sec = tm.tv_sec;
|
||||
now.tv_nsec = tm.tv_usec * 1000;
|
||||
@ -382,14 +319,7 @@ bool scond_wait_timeout(scond_t *cond, slock_t *lock, int64_t timeout_us)
|
||||
now.tv_sec += now.tv_nsec / 1000000000LL;
|
||||
now.tv_nsec = now.tv_nsec % 1000000000LL;
|
||||
|
||||
int ret = pthread_cond_timedwait(&cond->cond, &lock->lock, &now);
|
||||
return ret == 0;
|
||||
}
|
||||
|
||||
void scond_signal(scond_t *cond)
|
||||
{
|
||||
pthread_cond_signal(&cond->cond);
|
||||
}
|
||||
|
||||
ret = pthread_cond_timedwait(&cond->cond, &lock->lock, &now);
|
||||
return (ret == 0);
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user