thread pool: epicsThreadPoolWait return ETIMEOUT

This commit is contained in:
Michael Davidsaver
2014-07-25 09:59:46 -04:00
parent b3a1fe9c6b
commit cbfbce54f9
2 changed files with 3 additions and 3 deletions

View File

@@ -81,8 +81,8 @@ epicsShareFunc void epicsThreadPoolControl(epicsThreadPool* pool,
/* Block until job queue is emptied and no jobs are running.
* Useful after calling epicsThreadPoolControl() with option epicsThreadPoolQueueAdd=0
*
* timeout<0 waits forever, timeout==0 polls, timeout>0 waits for a fixed time
* Returns 1 for timeout, 0 for success, >1 on errors
* timeout<0 waits forever, timeout==0 polls, timeout>0 waits at most one timeout period
* Returns 0 for success or non-zero on error (timeout is ETIMEOUT)
*/
epicsShareFunc int epicsThreadPoolWait(epicsThreadPool* pool, double timeout);

View File

@@ -170,7 +170,7 @@ int epicsThreadPoolWait(epicsThreadPool* pool, double timeout)
cantProceed("epicsThreadPoolWait: failed to wait for Event");
break;
case epicsEventWaitTimeout:
ret=EWOULDBLOCK;
ret=ETIMEDOUT;
break;
case epicsEventWaitOK:
ret=0;