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

SharedPV allow use of Channel::destroy() to trigger onLastDisconnect()

Browse Source 
Add dead flag to catch double destroy() or use after destroy()
This commit is contained in:
Michael Davidsaver
2018-10-07 20:00:38 -07:00
parent ed1bd1b962
commit 9ca7487e29
5 changed files with 140 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/server/sharedstate_rpc.cpp
View File

@@ -109,17 +109,30 @@ void SharedRPC::lastRequest() {}
void SharedRPC::request(epics::pvData::PVStructure::shared_pointer const & pvArgument)
{
std::tr1::shared_ptr<SharedPV::Handler> handler;
pvd::Status sts;
{
Guard G(channel->owner->mutex);
handler = channel->owner->handler;
if(channel->dead) {
sts = pvd::Status::error("Dead Channel");
} else {
handler = channel->owner->handler;
}
}
std::tr1::shared_ptr<RPCOP> impl(new RPCOP(shared_from_this(), pvRequest, pvArgument),
Operation::Impl::Cleanup());
if(!sts.isOK()) {
requester_type::shared_pointer req(requester.lock());
if(req)
req->requestDone(sts, shared_from_this(), pvd::PVStructurePtr());
if(handler) {
Operation op(impl);
handler->onRPC(channel->owner, op);
} else {
std::tr1::shared_ptr<RPCOP> impl(new RPCOP(shared_from_this(), pvRequest, pvArgument),
Operation::Impl::Cleanup());
if(handler) {
Operation op(impl);
handler->onRPC(channel->owner, op);
}
}
}