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

work on RAII and memory leaks

Browse Source
This commit is contained in:
mrkraimer
2016-06-01 10:10:00 -04:00
parent 1eea87efc7
commit e025e542ea
15 changed files with 701 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pvAccess/monitorFactory.cpp
View File

@@ -219,7 +219,7 @@ void MonitorLocal::releaseActiveElement()
activeElement->overrunBitSet->clear();
}
MonitorRequesterPtr requester = monitorRequester.lock();
if(!requester.get()) return;
if(!requester) return;
requester->monitorEvent(getPtrSelf());
return;
}
@@ -323,7 +323,7 @@ bool MonitorLocal::init(PVStructurePtr const & pvRequest)
size_t queueSize = 2;
PVStructurePtr pvOptions = pvRequest->getSubField<PVStructure>("record._options");
MonitorRequesterPtr requester = monitorRequester.lock();
if(!requester.get()) return false;
if(!requester) return false;
if(pvOptions) {
PVStringPtr pvString = pvOptions->getSubField<PVString>("queueSize");
if(pvString) {
@@ -429,7 +429,7 @@ MonitorFactoryPtr getMonitorFactory()
static Mutex mutex;
Lock xx(mutex);
if(monitorFactoryPtr.get()==NULL) {
if(!monitorFactoryPtr) {
monitorFactoryPtr = MonitorFactoryPtr(
new MonitorFactory());
}