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

Merge jenkins changes

Browse Source
This commit is contained in:
Ralph Lange
2014-12-12 13:24:11 +01:00
parent 18ff90e641 a781195458
commit 0535ff990d
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/pvAccess/pvCopyMonitor.cpp
View File

@ -118,10 +118,13 @@ void PVCopyMonitor::destroy()
{
cout << "PVCopyMonitor::destroy()" << endl;
}
if(isDestroyed) return;
{
Lock xx(mutex);
if(isDestroyed) return;
}
stopMonitoring();
Lock xx(mutex);
isDestroyed = true;
stopMonitoring();
pvCopyMonitorRequester.reset();
pvCopy.reset();
}
@ -132,11 +135,11 @@ void PVCopyMonitor::startMonitoring(MonitorElementPtr const & startElement)
{
cout << "PVCopyMonitor::startMonitoring()" << endl;
}
if(isDestroyed) return;
monitorElement = startElement;
{
Lock xx(mutex);
if(isDestroyed) return;
if(isMonitoring) return;
monitorElement = startElement;
isMonitoring = true;
isGroupPut = false;
std::list<PVCopyMonitorFieldNodePtr>::iterator iter;
@ -171,20 +174,21 @@ void PVCopyMonitor::stopMonitoring()
{
cout << "PVCopyMonitor::stopMonitoring()" << endl;
}
if(isDestroyed) return;
if(!isMonitoring) return;
pvRecord->removeListener(getPtrSelf());
Lock xx(mutex);
std::list<PVCopyMonitorFieldNodePtr>::iterator iter;
for (iter = monitorFieldNodeList.begin();iter!=monitorFieldNodeList.end();++iter)
{
(*iter)->monitorPlugin->stopMonitoring();
Lock xx(mutex);
if(isDestroyed) return;
if(!isMonitoring) return;
isMonitoring = false;
std::list<PVCopyMonitorFieldNodePtr>::iterator iter;
for (iter = monitorFieldNodeList.begin();iter!=monitorFieldNodeList.end();++iter)
{
(*iter)->monitorPlugin->stopMonitoring();
}
}
isMonitoring = false;
pvRecord->removeListener(getPtrSelf());
}
void PVCopyMonitor::detach(PVRecordPtr const & pvRecord)
{
if(pvRecord->getTraceLevel()>0)