epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

TakeTimeout: make ticks at least 1

Browse Source
This commit is contained in:
Marty Kraimer
2000-06-02 14:48:13 +00:00
parent e0c9a741d2
commit c67d0a44ef
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libCom/osi/os/vxWorks/osdSem.c
+6 -3
View File
@@ -54,10 +54,10 @@ semTakeStatus semBinaryTakeTimeout(
int status;
int ticks;
ticks = (int)(timeOut * (double)sysClkRateGet());
if(ticks<=0) ticks = 1;
status = semTake((SEM_ID)id,ticks);
if(status==OK) return(semTakeOK);
if(errno==S_objLib_OBJ_TIMEOUT) return(semTakeTimeout);
if(ticks<=0) return(semTakeTimeout);
return(semTakeError);
}
@@ -109,9 +109,12 @@ semTakeStatus semMutexTakeTimeout(
semMutexId id, double timeOut)
{
int status;
status = semTake((SEM_ID)id,NO_WAIT);
int ticks;
ticks = (int)(timeOut * (double)sysClkRateGet());
if(ticks<=0) ticks = 1;
status = semTake((SEM_ID)id,ticks);
if(status==OK) return(semTakeOK);
if(errno==S_objLib_OBJ_UNAVAILABLE) return(semTakeTimeout);
if(errno==S_objLib_OBJ_TIMEOUT) return(semTakeTimeout);
return(semTakeError);
}