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

Fix for Mantis #254.

Browse Source
This commit is contained in:
Andrew Johnson
2006-12-21 16:47:56 +00:00
parent 6bed83c70e
commit f2154fec35
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libCom/osi/os/vxWorks/osdEvent.c
View File

@@ -16,6 +16,8 @@
#include <time.h>
#include <objLib.h>
#include <sysLib.h>
#include <limits.h>
/* The following not defined in an vxWorks header */
int sysClkRateGet(void);
@@ -42,14 +44,17 @@ void epicsEventDestroy(epicsEventId id)
epicsEventWaitStatus epicsEventWaitWithTimeout(
epicsEventId id, double timeOut)
{
int rate = sysClkRateGet();
int status;
int ticks;
if(timeOut<=0.0) {
if (timeOut <= 0.0) {
ticks = 0;
} else if (timeOut >= (double) INT_MAX / rate) {
ticks = WAIT_FOREVER;
} else {
ticks = timeOut*sysClkRateGet();
if(ticks<=0) ticks = 1;
ticks = timeOut * rate;
if (ticks<=0) ticks = 1;
}
status = semTake((SEM_ID)id,ticks);
if(status==OK) return(epicsEventWaitOK);