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

SimpleChannelProviderFactory: weak_ptr to shared instance

Browse Source
This commit is contained in:
Michael Davidsaver
2017-06-06 08:50:57 +02:00
parent 860054a7a2
commit 34eeb0717a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/pv/pvAccess.h
+6 -5
View File
@@ -1162,11 +1162,12 @@ struct SimpleChannelProviderFactory : public ChannelProviderFactory
virtual ChannelProvider::shared_pointer sharedInstance()
{
epics::pvData::Lock L(sharedM);
if(!shared) {
std::tr1::shared_ptr<Configuration> empty;
shared.reset(new Provider(empty));
ChannelProvider::shared_pointer ret(shared.lock());
if(!ret) {
ret.reset(new Provider(std::tr1::shared_ptr<Configuration>()));
shared = ret;
}
return shared;
return ret;
}
virtual ChannelProvider::shared_pointer newInstance(const std::tr1::shared_ptr<Configuration>& conf)
@@ -1178,7 +1179,7 @@ struct SimpleChannelProviderFactory : public ChannelProviderFactory
private:
const std::string pname;
epics::pvData::Mutex sharedM;
std::tr1::shared_ptr<Provider> shared;
ChannelProvider::weak_pointer shared;
};
/**