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

more unlock monitor setup

Browse Source
This commit is contained in:
Michael Davidsaver
2015-12-08 20:11:16 -05:00
parent 3118f92a61
commit 8abf5c20c6
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
p2pApp/channel.cpp
View File

@ -157,7 +157,6 @@ GWChannel::createMonitor(
pvd::StructureConstPtr typedesc;
try {
bool create = false;
{
Guard G(entry->cache->cacheLock);
@ -166,11 +165,24 @@ GWChannel::createMonitor(
ment.reset(new MonitorCacheEntry(entry.get()));
entry->mon_entries[ser] = ment; // ref. wrapped
ment->weakref = ment;
create = true;
// We've added an incomplete entry (no Monitor)
// so MonitorUser must check validity before de-ref.
// in this case we use !!typedesc as this also indicates
// that the upstream monitor is connected
pvd::MonitorPtr M;
{
UnGuard U(G);
// Create upstream monitor
// This would create a strong ref. loop between ent and ent->mon.
// Instead we get clever and pass a "fake" strong ref.
// and ensure that ~MonitorCacheEntry destroy()s the client Monitor
MonitorCacheEntry::shared_pointer fakereal(ment.get(), noclean());
M = entry->channel->createMonitor(fakereal, pvRequest);
}
ment->mon = M;
std::cout<<"Monitor cache "<<entry->channelName<<" Miss\n";
} else {
@ -178,24 +190,8 @@ GWChannel::createMonitor(
}
}
pvd::MonitorPtr M;
if(create) {
// Note: no lock held
// Create upstream monitor
// This would create a strong ref. loop between ent and ent->mon.
// Instead we get clever and pass a "fake" strong ref.
// and ensure that ~MonitorCacheEntry destroy()s the client Monitor
MonitorCacheEntry::shared_pointer fakereal(ment.get(), noclean());
M = entry->channel->createMonitor(fakereal, pvRequest);
}
Guard G(ment->mutex());
if(create)
ment->mon = M;
mon.reset(new MonitorUser(ment));
ment->interested.insert(mon);
mon->weakref = mon;