Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-25 14:57:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "[common] linux: improve event mechanics"

Browse Source 
The logic here is wrong, this should be done externally as multiple
waiters will cause issues
This commit is contained in:
Geoffrey McRae 2020-08-09 14:44:00 +10:00
parent 88d25ee98c
commit 19c2fe9b5e
2 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
B2-rc2-26-g0f2ecdf5f1+1 B2-rc2-25-g3511fb8d59+1

73
common/src/platform/linux/event.c
View File

@ -32,7 +32,7 @@ struct LGEvent
{ {
pthread_mutex_t mutex; pthread_mutex_t mutex;
pthread_cond_t cond; pthread_cond_t cond;
atomic_int signaled; uint32_t flag;
bool autoReset; bool autoReset;
}; };
@ -76,13 +76,6 @@ bool lgWaitEventAbs(LGEvent * handle, struct timespec * ts)
{ {
assert(handle); assert(handle);
if (atomic_load(&handle->signaled))
{
if (handle->autoReset)
atomic_fetch_sub(&handle->signaled, 1);
return true;
}
if (pthread_mutex_lock(&handle->mutex) != 0) if (pthread_mutex_lock(&handle->mutex) != 0)
{ {
DEBUG_ERROR("Failed to lock the mutex"); DEBUG_ERROR("Failed to lock the mutex");
@ -90,7 +83,7 @@ bool lgWaitEventAbs(LGEvent * handle, struct timespec * ts)
} }
bool ret = true; bool ret = true;
while(ret && !atomic_load(&handle->signaled)) while(ret && !atomic_load(&handle->flag))
{ {
if (!ts) if (!ts)
{ {
@ -99,17 +92,12 @@ bool lgWaitEventAbs(LGEvent * handle, struct timespec * ts)
DEBUG_ERROR("Wait to wait on the condition"); DEBUG_ERROR("Wait to wait on the condition");
ret = false; ret = false;
} }
if (handle->autoReset)
atomic_fetch_sub(&handle->signaled, 1);
} }
else else
{ {
switch(pthread_cond_timedwait(&handle->cond, &handle->mutex, ts)) switch(pthread_cond_timedwait(&handle->cond, &handle->mutex, ts))
{ {
case 0: case 0:
if (handle->autoReset)
atomic_fetch_sub(&handle->signaled, 1);
break; break;
case ETIMEDOUT: case ETIMEDOUT:
@ -124,6 +112,9 @@ bool lgWaitEventAbs(LGEvent * handle, struct timespec * ts)
} }
} }
if (handle->autoReset)
atomic_store(&handle->flag, 0);
if (pthread_mutex_unlock(&handle->mutex) != 0) if (pthread_mutex_unlock(&handle->mutex) != 0)
{ {
DEBUG_ERROR("Failed to unlock the mutex"); DEBUG_ERROR("Failed to unlock the mutex");
@ -135,13 +126,6 @@ bool lgWaitEventAbs(LGEvent * handle, struct timespec * ts)
bool lgWaitEventNS(LGEvent * handle, unsigned int timeout) bool lgWaitEventNS(LGEvent * handle, unsigned int timeout)
{ {
if (atomic_load(&handle->signaled))
{
if (handle->autoReset)
atomic_fetch_sub(&handle->signaled, 1);
return true;
}
if (timeout == TIMEOUT_INFINITE) if (timeout == TIMEOUT_INFINITE)
return lgWaitEventAbs(handle, NULL); return lgWaitEventAbs(handle, NULL);
@ -161,13 +145,6 @@ bool lgWaitEventNS(LGEvent * handle, unsigned int timeout)
bool lgWaitEvent(LGEvent * handle, unsigned int timeout) bool lgWaitEvent(LGEvent * handle, unsigned int timeout)
{ {
if (atomic_load(&handle->signaled))
{
if (handle->autoReset)
atomic_fetch_sub(&handle->signaled, 1);
return true;
}
return lgWaitEventNS(handle, timeout * 1000000); return lgWaitEventNS(handle, timeout * 1000000);
} }
@ -175,13 +152,24 @@ bool lgSignalEvent(LGEvent * handle)
{ {
assert(handle); assert(handle);
if (atomic_fetch_add(&handle->signaled, 1) == 0) if (pthread_mutex_lock(&handle->mutex) != 0)
{ {
if (pthread_cond_broadcast(&handle->cond) != 0) DEBUG_ERROR("Failed to lock the mutex");
{ return false;
DEBUG_ERROR("Failed to signal the condition"); }
return false;
} atomic_store(&handle->flag, 1);
if (pthread_mutex_unlock(&handle->mutex) != 0)
{
DEBUG_ERROR("Failed to unlock the mutex");
return false;
}
if (pthread_cond_broadcast(&handle->cond) != 0)
{
DEBUG_ERROR("Failed to signal the condition");
return false;
} }
return true; return true;
@ -190,7 +178,20 @@ bool lgSignalEvent(LGEvent * handle)
bool lgResetEvent(LGEvent * handle) bool lgResetEvent(LGEvent * handle)
{ {
assert(handle); assert(handle);
if (atomic_load(&handle->signaled))
atomic_fetch_sub(&handle->signaled, 1); if (pthread_mutex_lock(&handle->mutex) != 0)
{
DEBUG_ERROR("Failed to lock the mutex");
return false;
}
atomic_store(&handle->flag, 0);
if (pthread_mutex_unlock(&handle->mutex) != 0)
{
DEBUG_ERROR("Failed to unlock the mutex");
return false;
}
return true; return true;
} }