hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-27 11:24:05 +00:00
Code Issues Actions Projects Releases Wiki Activity

Update threadwrapper to enable pthread_rwlock_t

Browse source
This commit is contained in:
Joose Sainio 2019-11-21 13:38:40 +02:00
parent eb78aead1f
commit ab2fded8af
2 changed files with 53 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/threadwrapper/include/pthread.h
View file

@ -23,12 +23,14 @@ extern "C" {
typedef void* pthread_cond_t; typedef void* pthread_cond_t;
typedef void* pthread_cond_t; typedef void* pthread_cond_t;
typedef void* pthread_mutex_t; typedef void* pthread_mutex_t;
typedef void* pthread_rwlock_t;
typedef void* pthread_t; typedef void* pthread_t;
typedef void*(voidp_voidp_func)(void*); typedef void*(voidp_voidp_func)(void*);
typedef void pthread_attr_t; typedef void pthread_attr_t;
typedef void pthread_condattr_t; typedef void pthread_condattr_t;
typedef void pthread_mutexattr_t; typedef void pthread_mutexattr_t;
typedef void pthread_rwlockattr_t;
// Parameter names that have been commented away do nothing, // Parameter names that have been commented away do nothing,
// as they are always null when the functions are used in Kvazaar. // as they are always null when the functions are used in Kvazaar.
@ -48,6 +50,12 @@ int pthread_mutex_init(pthread_mutex_t* mutex, const pthread_mutexattr_t* /*attr
int pthread_mutex_lock(pthread_mutex_t* mutex); int pthread_mutex_lock(pthread_mutex_t* mutex);
int pthread_mutex_unlock(pthread_mutex_t* mutex); int pthread_mutex_unlock(pthread_mutex_t* mutex);
int pthread_rwlock_init(pthread_rwlock_t* lock, const pthread_rwlockattr_t * /*attr*/);
int pthread_rwlock_destroy(pthread_rwlock_t *rwlock);
int pthread_rwlock_rdlock(pthread_rwlock_t *rwlock);
int pthread_rwlock_wrlock(pthread_rwlock_t *rwlock);
int pthread_rwlock_unlock(pthread_rwlock_t *rwlock);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

45
src/threadwrapper/src/pthread.cpp
View file

@ -17,8 +17,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "pthread.h" #include "pthread.h"
#include <condition_variable> #include <condition_variable>
#include <mutex> #include <mutex>
#include <shared_mutex>
#include <thread> #include <thread>
typedef struct {
std::shared_mutex *lock;
bool write_lock;
} rw_lock_internal;
int pthread_cond_broadcast(pthread_cond_t* cond) { int pthread_cond_broadcast(pthread_cond_t* cond) {
static_cast<std::condition_variable*>(*cond)->notify_all(); static_cast<std::condition_variable*>(*cond)->notify_all();
@ -86,3 +91,43 @@ int pthread_mutex_unlock(pthread_mutex_t* mutex) {
static_cast<std::mutex*>(*mutex)->unlock(); static_cast<std::mutex*>(*mutex)->unlock();
return 0; return 0;
} }
int pthread_rwlock_init(pthread_rwlock_t * lock, const pthread_rwlockattr_t *)
{
*lock = new rw_lock_internal;
static_cast<rw_lock_internal*>(*lock)->lock = new std::shared_mutex;
static_cast<rw_lock_internal*>(*lock)->write_lock = false;
return 0;
}
int pthread_rwlock_destroy(pthread_rwlock_t* rwlock)
{
delete static_cast<rw_lock_internal*>(*rwlock)->lock;
delete static_cast<rw_lock_internal*>(*rwlock);
return 0;
}
int pthread_rwlock_rdlock(pthread_rwlock_t* rwlock)
{
static_cast<rw_lock_internal*>(*rwlock)->lock->lock_shared();
return 0;
}
int pthread_rwlock_wrlock(pthread_rwlock_t* rwlock)
{
static_cast<rw_lock_internal*>(*rwlock)->lock->lock();
static_cast<rw_lock_internal*>(*rwlock)->write_lock = true;
return 0;
}
int pthread_rwlock_unlock(pthread_rwlock_t* rwlock)
{
if (static_cast<rw_lock_internal*>(*rwlock)->write_lock) {
static_cast<rw_lock_internal*>(*rwlock)->write_lock = false;
static_cast<rw_lock_internal*>(*rwlock)->lock->unlock();
}
else {
static_cast<rw_lock_internal*>(*rwlock)->lock->unlock_shared();
}
return 0;
}