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

Return epicsMutexLockTimeout on failure to lock in epicsMutexTryLock since

Browse Source 
that's the return code checked by the test programs.
This commit is contained in:
W. Eric Norum
2002-04-15 19:35:31 +00:00
parent 412f5e32b4
commit d1f0435eb8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libCom/osi/os/RTEMS/osdMutex.c
View File

@@ -80,7 +80,7 @@ epicsMutexOsdCreate(void)
the_semaphore = _Semaphore_Get( sid, &location );
_Thread_Enable_dispatch();
return the_semaphore;
return (epicsMutexId)the_semaphore;
}
#endif
return (epicsMutexId)sid;
@@ -206,8 +206,10 @@ epicsMutexLockStatus epicsMutexTryLock(epicsMutexId id)
0, /* same as passed to obtain -- ticks */
level
);
if (_Thread_Executing->Wait.return_code == 0)
if (_Thread_Executing->Wait.return_code == CORE_MUTEX_STATUS_SUCCESSFUL)
return epicsMutexLockOK;
else if (_Thread_Executing->Wait.return_code == CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT)
return epicsMutexLockTimeout;
else
return epicsMutexLockError;
#else
@@ -228,5 +230,5 @@ epicsShareFunc void epicsMutexShow(epicsMutexId id,unsigned int level)
Semaphore_Control *the_semaphore = (Semaphore_Control *)id;
id = (epicsMutexId)the_semaphore->Object.id;
#endif
epicsEventShow (id,level);
epicsEventShow ((epicsEventId)id,level);
}