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

StaticProvider createChannel() avoid possible deadlock

Browse Source 
connect() may invoke SharedPV onFirstConnect() callback.
This commit is contained in:
Michael Davidsaver
2018-09-26 14:56:11 -07:00
parent 7ed6f1315f
commit 83b2105241
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/server.cpp
View File

@@ -87,12 +87,17 @@ struct StaticProvider::Impl : public pva::ChannelProvider
pva::Channel::shared_pointer ret;
pvd::Status sts;
builders_t::mapped_type builder;
{
Guard G(mutex);
builders_t::const_iterator it(builders.find(name));
if(it!=builders.end())
ret = it->second->connect(Impl::shared_pointer(internal_self), name, requester);
if(it!=builders.end()) {
UnGuard U(G);
builder = it->second;
}
}
if(builder)
ret = builder->connect(Impl::shared_pointer(internal_self), name, requester);
if(!ret) {
sts = pvd::Status::error("No such channel");