lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 24.0.1+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2019-09-22 23:19:10 +02:00
parent b14f9eae6d
commit 5a730d6ec3
842 changed files with 42245 additions and 33385 deletions
Download patch file Download diff file Expand all files Collapse all files

45
libobs/util/threading-posix.c
View file

@ -35,9 +35,9 @@
struct os_event_data {
pthread_mutex_t mutex;
pthread_cond_t cond;
volatile bool signalled;
bool manual;
pthread_cond_t cond;
volatile bool signalled;
bool manual;
};
int os_event_init(os_event_t **event, enum os_event_type type)
@ -89,11 +89,10 @@ int os_event_wait(os_event_t *event)
return code;
}
static inline void add_ms_to_ts(struct timespec *ts,
unsigned long milliseconds)
static inline void add_ms_to_ts(struct timespec *ts, unsigned long milliseconds)
{
ts->tv_sec += milliseconds/1000;
ts->tv_nsec += (milliseconds%1000)*1000000;
ts->tv_sec += milliseconds / 1000;
ts->tv_nsec += (milliseconds % 1000) * 1000000;
if (ts->tv_nsec > 1000000000) {
ts->tv_sec += 1;
ts->tv_nsec -= 1000000000;
@ -109,7 +108,7 @@ int os_event_timedwait(os_event_t *event, unsigned long milliseconds)
#if defined(__APPLE__) || defined(__MINGW32__)
struct timeval tv;
gettimeofday(&tv, NULL);
ts.tv_sec = tv.tv_sec;
ts.tv_sec = tv.tv_sec;
ts.tv_nsec = tv.tv_usec * 1000;
#else
clock_gettime(CLOCK_REALTIME, &ts);
@ -166,13 +165,13 @@ void os_event_reset(os_event_t *event)
struct os_sem_data {
semaphore_t sem;
task_t task;
task_t task;
};
int os_sem_init(os_sem_t **sem, int value)
int os_sem_init(os_sem_t **sem, int value)
{
semaphore_t new_sem;
task_t task = mach_task_self();
task_t task = mach_task_self();
if (semaphore_create(task, &new_sem, 0, value) != KERN_SUCCESS)
return -1;
@ -181,7 +180,7 @@ int os_sem_init(os_sem_t **sem, int value)
if (!*sem)
return -2;
(*sem)->sem = new_sem;
(*sem)->sem = new_sem;
(*sem)->task = task;
return 0;
}
@ -194,15 +193,17 @@ void os_sem_destroy(os_sem_t *sem)
}
}
int os_sem_post(os_sem_t *sem)
int os_sem_post(os_sem_t *sem)
{
if (!sem) return -1;
if (!sem)
return -1;
return (semaphore_signal(sem->sem) == KERN_SUCCESS) ? 0 : -1;
}
int os_sem_wait(os_sem_t *sem)
int os_sem_wait(os_sem_t *sem)
{
if (!sem) return -1;
if (!sem)
return -1;
return (semaphore_wait(sem->sem) == KERN_SUCCESS) ? 0 : -1;
}
@ -212,7 +213,7 @@ struct os_sem_data {
sem_t sem;
};
int os_sem_init(os_sem_t **sem, int value)
int os_sem_init(os_sem_t **sem, int value)
{
sem_t new_sem;
int ret = sem_init(&new_sem, 0, value);
@ -232,15 +233,17 @@ void os_sem_destroy(os_sem_t *sem)
}
}
int os_sem_post(os_sem_t *sem)
int os_sem_post(os_sem_t *sem)
{
if (!sem) return -1;
if (!sem)
return -1;
return sem_post(&sem->sem);
}
int os_sem_wait(os_sem_t *sem)
int os_sem_wait(os_sem_t *sem)
{
if (!sem) return -1;
if (!sem)
return -1;
return sem_wait(&sem->sem);
}