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

epicsSpin: try lock return non-blocking

Browse Source 
Avoid cantProceed() in try lock, even for undefined behavior.
This commit is contained in:
Michael Davidsaver
2014-07-25 15:12:02 -04:00
parent 5824f98972
commit 8fec9d6e00
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libCom/osi/os/RTEMS/osdSpin.c
View File

@@ -59,7 +59,6 @@ void epicsSpinLock(epicsSpinId spin) {
rtems_interrupt_level level;
rtems_interrupt_disable (level);
_Thread_Disable_dispatch();
spin->level = level;
if(spin->locked) {
rtems_interrupt_enable (level);
_Thread_Enable_dispatch();
@@ -71,11 +70,21 @@ void epicsSpinLock(epicsSpinId spin) {
}
return;
}
spin->level = level;
spin->locked = 1;
}
int epicsSpinTryLock(epicsSpinId spin) {
epicsSpinLock(spin);
rtems_interrupt_level level;
rtems_interrupt_disable (level);
_Thread_Disable_dispatch();
if(spin->locked) {
rtems_interrupt_enable (level);
_Thread_Enable_dispatch();
return 1;
}
spin->level = level;
spin->locked = 1;
return 0;
}

12
src/libCom/osi/os/vxWorks/osdSpin.c
View File

@@ -71,7 +71,17 @@ void epicsSpinLock(epicsSpinId spin) {
}
int epicsSpinTryLock(epicsSpinId spin) {
epicsSpinLock(spin);
int key = intLock();
if(!intContext())
taskLock();
if(spin->locked) {
intUnlock(key);
if(!intContext())
taskUnlock();
return 1;
}
spin->key = key;
spin->locked = 1;
return 0;
}