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

one more race condition when server server exits

Browse Source
This commit is contained in:
Marty Kraimer
2014-12-12 08:18:56 -05:00
parent a781195458
commit c2ea402be0
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pvAccess/monitorFactory.cpp
+6 -4
View File
@@ -146,10 +146,12 @@ Status MonitorLocal::stop()
if(pvRecord->getTraceLevel()>0){ if(pvRecord->getTraceLevel()>0){
cout << "MonitorLocal::stop() " << endl; cout << "MonitorLocal::stop() " << endl;
} }
Lock xx(mutex); {
if(state==destroyed) return wasDestroyedStatus; Lock xx(mutex);
if(state==idle) return notStartedStatus; if(state==destroyed) return wasDestroyedStatus;
state = idle; if(state==idle) return notStartedStatus;
state = idle;
}
pvCopyMonitor->stopMonitoring(); pvCopyMonitor->stopMonitoring();
return Status::Ok; return Status::Ok;
} }