mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-03-04 15:51:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[common] linux: review and fix event logic, events should not be counted

Browse source
This commit is contained in:
Geoffrey McRae 2021-07-19 13:19:59 +10:00
parent 33bf668697
commit 2038517861
1 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
common/src/platform/linux/event.c
View file

@ -33,7 +33,8 @@ struct LGEvent
{ {
pthread_mutex_t mutex; pthread_mutex_t mutex;
pthread_cond_t cond; pthread_cond_t cond;
atomic_uint count; atomic_int waiting;
atomic_bool signaled;
bool autoReset; bool autoReset;
}; };
@ -79,6 +80,9 @@ void lgFreeEvent(LGEvent * handle)
{ {
assert(handle); assert(handle);
if (atomic_load_explicit(&handle->waiting, memory_order_acquire) != 0)
DEBUG_ERROR("BUG: Freeing an event that still has threads waiting on it");
pthread_cond_destroy (&handle->cond ); pthread_cond_destroy (&handle->cond );
pthread_mutex_destroy(&handle->mutex); pthread_mutex_destroy(&handle->mutex);
free(handle); free(handle);
@ -89,17 +93,17 @@ bool lgWaitEventAbs(LGEvent * handle, struct timespec * ts)
assert(handle); assert(handle);
bool ret = true; bool ret = true;
int count = 0;
int res; int res;
while(ret && (count = atomic_load(&handle->count)) == 0) if (pthread_mutex_lock(&handle->mutex) != 0)
{ {
if (pthread_mutex_lock(&handle->mutex) != 0) DEBUG_ERROR("Failed to lock the mutex");
{ return false;
DEBUG_ERROR("Failed to lock the mutex"); }
return false;
}
atomic_fetch_add_explicit(&handle->waiting, 1, memory_order_release);
while(ret && !atomic_load_explicit(&handle->signaled, memory_order_acquire))
{
if (!ts) if (!ts)
{ {
if ((res = pthread_cond_wait(&handle->cond, &handle->mutex)) != 0) if ((res = pthread_cond_wait(&handle->cond, &handle->mutex)) != 0)
@ -125,16 +129,17 @@ bool lgWaitEventAbs(LGEvent * handle, struct timespec * ts)
break; break;
} }
} }
}
if (pthread_mutex_unlock(&handle->mutex) != 0) atomic_fetch_sub_explicit(&handle->waiting, 1, memory_order_release);
{ if (pthread_mutex_unlock(&handle->mutex) != 0)
DEBUG_ERROR("Failed to unlock the mutex"); {
return false; DEBUG_ERROR("Failed to unlock the mutex");
} return false;
} }
if (ret && handle->autoReset) if (ret && handle->autoReset)
atomic_fetch_sub(&handle->count, count); atomic_store_explicit(&handle->signaled, false, memory_order_release);
return ret; return ret;
} }
@ -170,10 +175,10 @@ bool lgSignalEvent(LGEvent * handle)
{ {
assert(handle); assert(handle);
const bool signalled = atomic_fetch_add_explicit(&handle->count, 1, const bool signaled = atomic_exchange_explicit(&handle->signaled, true,
memory_order_acquire) > 0; memory_order_release);
if (signalled) if (signaled)
return true; return true;
if (pthread_cond_broadcast(&handle->cond) != 0) if (pthread_cond_broadcast(&handle->cond) != 0)
@ -188,6 +193,6 @@ bool lgSignalEvent(LGEvent * handle)
bool lgResetEvent(LGEvent * handle) bool lgResetEvent(LGEvent * handle)
{ {
assert(handle); assert(handle);
atomic_store(&handle->count, 0); atomic_store_explicit(&handle->signaled, false, memory_order_release);
return true; return true;
} }