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

default MQ report event wait errors

Browse Source
This commit is contained in:
Michael Davidsaver
2012-05-24 14:31:29 -04:00
parent 5d2e5b46e5
commit 3e9bae45b9
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,10 +187,11 @@ mySend(epicsMessageQueueId pmsg, void *message, unsigned int size, bool wait, bo
epicsMutexUnlock(pmsg->mutex);
epicsEventStatus sts;
if(haveTimeout)
epicsEventWaitWithTimeout(threadNode.evp->event, timeout);
sts=epicsEventWaitWithTimeout(threadNode.evp->event, timeout);
else
epicsEventWait(threadNode.evp->event);
sts=epicsEventWait(threadNode.evp->event);
epicsMutexMustLock(pmsg->mutex);
@@ -200,7 +201,7 @@ mySend(epicsMessageQueueId pmsg, void *message, unsigned int size, bool wait, bo
ellAdd(&pmsg->eventFreeList, &threadNode.evp->link);
if (pmsg->full && (ellFirst(&pmsg->receiveQueue) == NULL)) {
if ((pmsg->full && (ellFirst(&pmsg->receiveQueue) == NULL)) || sts!=epicsEventOK) {
epicsMutexUnlock(pmsg->mutex);
return -1;
}
@@ -331,10 +332,11 @@ myReceive(epicsMessageQueueId pmsg, void *message, unsigned int size, bool wait,
ellAdd(&pmsg->receiveQueue, &threadNode.link);
epicsMutexUnlock(pmsg->mutex);
epicsEventStatus sts;
if(haveTimeout)
epicsEventWaitWithTimeout(threadNode.evp->event, timeout);
sts=epicsEventWaitWithTimeout(threadNode.evp->event, timeout);
else
epicsEventWait(threadNode.evp->event);
sts=epicsEventWait(threadNode.evp->event);
epicsMutexMustLock(pmsg->mutex);
@@ -344,7 +346,7 @@ myReceive(epicsMessageQueueId pmsg, void *message, unsigned int size, bool wait,
epicsMutexUnlock(pmsg->mutex);
if(threadNode.eventSent && (threadNode.size <= size))
if(threadNode.eventSent && (threadNode.size <= size) && sts==epicsEventOK)
return threadNode.size;
return -1;
}