EPICS_base/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

minor

Browse Source
This commit is contained in:
Michael Davidsaver
2018-02-21 11:19:58 -08:00
parent b5bf6a4ccd
commit 909cef9200
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/monitorme.cpp
View File

@ -175,6 +175,8 @@ struct MonTracker : public pvac::ClientChannel::MonitorCallback,
if(n==2) { if(n==2) {
// too many updates, re-queue to balance with others // too many updates, re-queue to balance with others
monwork.push(shared_from_this(), evt); monwork.push(shared_from_this(), evt);
} else if(n==0) {
std::cerr<<"Spurious Data event "<<name<<"\n";
} }
} }
break; break;

2
src/server/responseHandlers.cpp
View File

@ -2035,7 +2035,7 @@ void ServerMonitorRequesterImpl::destroy()
// hold a reference to channelMonitor so that _channelMonitor.reset() // hold a reference to channelMonitor so that _channelMonitor.reset()
// does not call ~Monitor (external code) while we are holding a lock // does not call ~Monitor (external code) while we are holding a lock
Monitor::shared_pointer monitor = _channelMonitor; Monitor::shared_pointer monitor(_channelMonitor);
{ {
Lock guard(_mutex); Lock guard(_mutex);
_channel->unregisterRequest(_ioid); _channel->unregisterRequest(_ioid);