jyapayne/moonlight-common-c
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unsafe cancellation code from events

Browse source
This commit is contained in:
Cameron Gutman 2016-02-16 09:17:59 -05:00
commit 8b6ca3d89b
2 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
limelight-common/Platform.c
View file

@ -239,7 +239,6 @@ int PltCreateEvent(PLT_EVENT* event) {
pthread_mutex_init(&event->mutex, NULL); pthread_mutex_init(&event->mutex, NULL);
pthread_cond_init(&event->cond, NULL); pthread_cond_init(&event->cond, NULL);
event->signalled = 0; event->signalled = 0;
event->cancelled = 0;
return 0; return 0;
#endif #endif
} }
@ -248,12 +247,6 @@ void PltCloseEvent(PLT_EVENT* event) {
#if defined(LC_WINDOWS) #if defined(LC_WINDOWS)
CloseHandle(*event); CloseHandle(*event);
#else #else
// Wake up anyone going to wait on this event.
// There's an inherent race condition in this technique
// but it shouldn't be too problematic for our purposes.
event->cancelled = 1;
pthread_cond_broadcast(&event->cond);
pthread_mutex_destroy(&event->mutex); pthread_mutex_destroy(&event->mutex);
pthread_cond_destroy(&event->cond); pthread_cond_destroy(&event->cond);
#endif #endif
@ -295,20 +288,13 @@ int PltWaitForEvent(PLT_EVENT* event) {
return -1; return -1;
} }
#else #else
int ret;
if (event->cancelled) {
return PLT_WAIT_INTERRUPTED;
}
pthread_mutex_lock(&event->mutex); pthread_mutex_lock(&event->mutex);
while (!event->signalled && !event->cancelled) { while (!event->signalled) {
pthread_cond_wait(&event->cond, &event->mutex); pthread_cond_wait(&event->cond, &event->mutex);
} }
ret = event->cancelled ? PLT_WAIT_INTERRUPTED : PLT_WAIT_SUCCESS;
pthread_mutex_unlock(&event->mutex); pthread_mutex_unlock(&event->mutex);
return ret; return PLT_WAIT_SUCCESS;
#endif #endif
} }

1
limelight-common/PlatformThreads.h
View file

@ -28,7 +28,6 @@ typedef struct _PLT_EVENT {
pthread_mutex_t mutex; pthread_mutex_t mutex;
pthread_cond_t cond; pthread_cond_t cond;
int signalled; int signalled;
int cancelled;
} PLT_EVENT; } PLT_EVENT;
#else #else
#error Unsupported platform #error Unsupported platform