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

destruction of shared provider

Browse Source
This commit is contained in:
Matej Sekoranja
2016-03-10 10:26:33 +01:00
parent f0417995d0
commit d139c42d17
2 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/factory/ChannelAccessFactory.cpp
View File

@@ -32,30 +32,32 @@ static ChannelProviderFactoryMap channelProviders;
class ChannelProviderRegistryImpl : public ChannelProviderRegistry {
public:
ChannelProvider::shared_pointer getProvider(std::string const & _providerName) {
// TODO remove, here for backward compatibility
const string providerName = (_providerName == "pvAccess") ? "pva" : _providerName;
Lock guard(channelProviderMutex);
ChannelProviderFactoryMap::const_iterator iter = channelProviders.find(providerName);
if (iter != channelProviders.end())
return iter->second->sharedInstance();
else
return ChannelProvider::shared_pointer();
ChannelProvider::shared_pointer getProvider(std::string const & providerName) {
ChannelProviderFactory::shared_pointer providerFactory;
{
Lock guard(channelProviderMutex);
ChannelProviderFactoryMap::const_iterator iter = channelProviders.find(providerName);
if (iter == channelProviders.end())
return ChannelProvider::shared_pointer();
else
providerFactory = iter->second;
}
return providerFactory->sharedInstance();
}
ChannelProvider::shared_pointer createProvider(std::string const & _providerName) {
ChannelProvider::shared_pointer createProvider(std::string const & providerName) {
// TODO remove, here for backward compatibility
const string providerName = (_providerName == "pvAccess") ? "pva" : _providerName;
Lock guard(channelProviderMutex);
ChannelProviderFactoryMap::const_iterator iter = channelProviders.find(providerName);
if (iter != channelProviders.end())
return iter->second->newInstance();
else
return ChannelProvider::shared_pointer();
ChannelProviderFactory::shared_pointer providerFactory;
{
Lock guard(channelProviderMutex);
ChannelProviderFactoryMap::const_iterator iter = channelProviders.find(providerName);
if (iter == channelProviders.end())
return ChannelProvider::shared_pointer();
else
providerFactory = iter->second;
}
return providerFactory->newInstance();
}
std::auto_ptr<stringVector_t> getProviderNames() {