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

Allow the input queue to drain before terminating the thread

Browse source 
This ensures any final input messages (like key ups) make it to the host
This commit is contained in:
Cameron Gutman 2021-05-15 22:01:50 -05:00
commit 431e188b07
3 changed files with 57 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

65
src/LinkedBlockingQueue.c
View file

@ -2,7 +2,7 @@
// Destroy the linked blocking queue and associated mutex and event
PLINKED_BLOCKING_QUEUE_ENTRY LbqDestroyLinkedBlockingQueue(PLINKED_BLOCKING_QUEUE queueHead) {
LC_ASSERT(queueHead->shutdown || queueHead->lifetimeSize == 0);
LC_ASSERT(queueHead->shutdown || queueHead->draining || queueHead->lifetimeSize == 0);
PltDeleteMutex(&queueHead->mutex);
PltCloseEvent(&queueHead->containsDataEvent);
@ -62,6 +62,11 @@ void LbqSignalQueueShutdown(PLINKED_BLOCKING_QUEUE queueHead) {
PltSetEvent(&queueHead->containsDataEvent);
}
void LbqSignalQueueDrain(PLINKED_BLOCKING_QUEUE queueHead) {
queueHead->draining = true;
PltSetEvent(&queueHead->containsDataEvent);
}
int LbqGetItemCount(PLINKED_BLOCKING_QUEUE queueHead) {
return queueHead->currentSize;
}
@ -69,7 +74,7 @@ int LbqGetItemCount(PLINKED_BLOCKING_QUEUE queueHead) {
int LbqOfferQueueItem(PLINKED_BLOCKING_QUEUE queueHead, void* data, PLINKED_BLOCKING_QUEUE_ENTRY entry) {
bool wasEmpty;
if (queueHead->shutdown) {
if (queueHead->shutdown || queueHead->draining) {
return LBQ_INTERRUPTED;
}
@ -120,14 +125,25 @@ int LbqPeekQueueElement(PLINKED_BLOCKING_QUEUE queueHead, void** data) {
}
if (queueHead->head == NULL) {
return LBQ_NO_ELEMENT;
if (queueHead->draining) {
return LBQ_INTERRUPTED;
}
else {
return LBQ_NO_ELEMENT;
}
}
PltLockMutex(&queueHead->mutex);
if (queueHead->head == NULL) {
PltUnlockMutex(&queueHead->mutex);
return LBQ_NO_ELEMENT;
if (queueHead->draining) {
PltUnlockMutex(&queueHead->mutex);
return LBQ_INTERRUPTED;
}
else {
PltUnlockMutex(&queueHead->mutex);
return LBQ_NO_ELEMENT;
}
}
*data = queueHead->head->data;
@ -145,14 +161,25 @@ int LbqPollQueueElement(PLINKED_BLOCKING_QUEUE queueHead, void** data) {
}
if (queueHead->head == NULL) {
return LBQ_NO_ELEMENT;
if (queueHead->draining) {
return LBQ_INTERRUPTED;
}
else {
return LBQ_NO_ELEMENT;
}
}
PltLockMutex(&queueHead->mutex);
if (queueHead->head == NULL) {
PltUnlockMutex(&queueHead->mutex);
return LBQ_NO_ELEMENT;
if (queueHead->draining) {
PltUnlockMutex(&queueHead->mutex);
return LBQ_INTERRUPTED;
}
else {
PltUnlockMutex(&queueHead->mutex);
return LBQ_NO_ELEMENT;
}
}
entry = queueHead->head;
@ -178,7 +205,7 @@ int LbqPollQueueElement(PLINKED_BLOCKING_QUEUE queueHead, void** data) {
int LbqWaitForQueueElement(PLINKED_BLOCKING_QUEUE queueHead, void** data) {
PLINKED_BLOCKING_QUEUE_ENTRY entry;
int err;
if (queueHead->shutdown) {
return LBQ_INTERRUPTED;
}
@ -187,23 +214,33 @@ int LbqWaitForQueueElement(PLINKED_BLOCKING_QUEUE queueHead, void** data) {
// We can also avoid a syscall if the head pointer is non-NULL.
// It's not safe to dereference the value due to potential memory
// ordering hazards, but we can use its presence to elide the wait.
if (queueHead->head == NULL) {
//
// If we're draining, we will never wait on the queue.
if (queueHead->head == NULL && !queueHead->draining) {
err = PltWaitForEvent(&queueHead->containsDataEvent);
if (err != PLT_WAIT_SUCCESS) {
return LBQ_INTERRUPTED;
}
}
PltLockMutex(&queueHead->mutex);
if (queueHead->shutdown) {
PltUnlockMutex(&queueHead->mutex);
return LBQ_INTERRUPTED;
}
PltLockMutex(&queueHead->mutex);
if (queueHead->head == NULL) {
PltClearEvent(&queueHead->containsDataEvent);
PltUnlockMutex(&queueHead->mutex);
continue;
if (queueHead->draining) {
PltUnlockMutex(&queueHead->mutex);
return LBQ_INTERRUPTED;
}
else {
PltUnlockMutex(&queueHead->mutex);
continue;
}
}
entry = queueHead->head;