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

p2p: avoid unnecessary use of provider registery

Browse Source
This commit is contained in:
Michael Davidsaver
2017-07-13 18:40:47 +02:00
parent 09b6671c82
commit f8d29e5afd
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
p2pApp/server.cpp
View File

@ -109,13 +109,6 @@ void GWServerChannelProvider::destroy()
std::cout<<"GWServer destory request\n";
}
GWServerChannelProvider::GWServerChannelProvider(const std::tr1::shared_ptr<epics::pvAccess::Configuration> &conf)
:cache(pva::ChannelProviderRegistry::clients()->getProvider("pva"))
{
//TODO: use Configuration to get "pva"
std::cout<<"GW Server ctor\n";
}
GWServerChannelProvider::GWServerChannelProvider(const pva::ChannelProvider::shared_pointer& prov)
:cache(prov)
{
@ -508,8 +501,6 @@ void pvadebug(const char *lvl)
void registerGWServerIocsh()
{
pva::ChannelProviderRegistry::servers()->add<GWServerChannelProvider>("GWServer", false);
iocshRegister<&startServer>("gwstart");
iocshRegister<&stopServer>("gwstop");
iocshRegister<int, &infoServer>("pvasr", "level");
@ -522,5 +513,4 @@ void registerGWServerIocsh()
void gwServerShutdown()
{
stopServer();
pva::ChannelProviderRegistry::servers()->remove("GWServer");
}

1
p2pApp/server.h
View File

@ -31,7 +31,6 @@ struct epicsShareClass GWServerChannelProvider : public
short priority, std::string const & addressx);
virtual void destroy();
explicit GWServerChannelProvider(const std::tr1::shared_ptr<epics::pvAccess::Configuration>& conf);
explicit GWServerChannelProvider(const epics::pvAccess::ChannelProvider::shared_pointer& prov);
virtual ~GWServerChannelProvider();
};