epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

osdMessageQueue: Return sooner on -ve timeout

Browse Source 
It appears that previously a negative timeout actually implemented a
'wait forever', but the VxWorks and RTEMS implementations both check
for (timeout <= 0) and return immediately if nothing can be done
without waiting.
This commit is contained in:
Andrew Johnson
2020-04-30 23:27:43 -05:00
parent 298c8706ec
commit cf2fef2405
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libCom/osi/os/default/osdMessageQueue.cpp
View File

@@ -165,7 +165,7 @@ mySend(epicsMessageQueueId pmsg, void *message, unsigned int size,
/*
* Return if not allowed to wait
*/
if (timeout == 0) {
if (timeout <= 0) {
epicsMutexUnlock(pmsg->mutex);
return -1;
}
@@ -186,11 +186,8 @@ mySend(epicsMessageQueueId pmsg, void *message, unsigned int size,
epicsMutexUnlock(pmsg->mutex);
epicsEventStatus status;
if (timeout > 0)
status = epicsEventWaitWithTimeout(threadNode.evp->event, timeout);
else
status = epicsEventWait(threadNode.evp->event);
epicsEventStatus status =
epicsEventWaitWithTimeout(threadNode.evp->event, timeout);
epicsMutexMustLock(pmsg->mutex);
@@ -304,7 +301,7 @@ myReceive(epicsMessageQueueId pmsg, void *message, unsigned int size,
/*
* Return if not allowed to wait
*/
if (timeout == 0) {
if (timeout <= 0) {
epicsMutexUnlock(pmsg->mutex);
return -1;
}
@@ -335,10 +332,11 @@ myReceive(epicsMessageQueueId pmsg, void *message, unsigned int size,
ellAdd(&pmsg->receiveQueue, &threadNode.link);
epicsMutexUnlock(pmsg->mutex);
if (timeout > 0)
/*
* Wait for a message to arrive
*/
epicsEventStatus status =
epicsEventWaitWithTimeout(threadNode.evp->event, timeout);
else
epicsEventWait(threadNode.evp->event);
epicsMutexMustLock(pmsg->mutex);