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

pvAccess -> pva provider name change

Browse Source
This commit is contained in:
Matej Sekoranja
2013-09-23 11:26:10 +02:00
parent f2a10fd37a
commit 236a7311d5
10 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pvAccessApp/factory/ChannelAccessFactory.cpp
View File

@@ -28,7 +28,11 @@ static ChannelProviderFactoryMap channelProviders;
class ChannelAccessImpl : public ChannelAccess {
public:
ChannelProvider::shared_pointer getProvider(String const & providerName) {
ChannelProvider::shared_pointer getProvider(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())
@@ -37,7 +41,11 @@ class ChannelAccessImpl : public ChannelAccess {
return ChannelProvider::shared_pointer();
}
ChannelProvider::shared_pointer createProvider(String const & providerName) {
ChannelProvider::shared_pointer createProvider(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())

2
pvAccessApp/remoteClient/clientContextImpl.cpp
View File

@@ -44,7 +44,7 @@ using namespace epics::pvData;
namespace epics {
namespace pvAccess {
String ClientContextImpl::PROVIDER_NAME = "pvAccess"; // TODO to be renamed to "pva"
String ClientContextImpl::PROVIDER_NAME = "pva";
Status ChannelImpl::channelDestroyed = Status(Status::STATUSTYPE_WARNING, "channel destroyed");
Status ChannelImpl::channelDisconnected = Status(Status::STATUSTYPE_WARNING, "channel disconnected");

2
pvAccessApp/rpcClient/rpcClient.cpp
View File

@@ -213,7 +213,7 @@ private:
void init()
{
using namespace std::tr1;
m_provider = getChannelAccess()->getProvider("pvAccess");
m_provider = getChannelAccess()->getProvider("pva");
shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl());
m_channelRequesterImpl = channelRequesterImpl;

10
testApp/remote/eget.cpp
View File

@@ -1668,14 +1668,8 @@ int main (int argc, char *argv[])
for (int n = 0; n < nPvs; n++)
{
shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl(quiet));
// TODO to be removed
String providerName = providerNames[n];
if (providerName == "pva")
providerName = "pvAccess";
// TODO no privder check
channels[n] = getChannelAccess()->getProvider(providerName)->createChannel(pvs[n], channelRequesterImpl);
channels[n] = getChannelAccess()->getProvider(providerNames[n])->createChannel(pvs[n], channelRequesterImpl);
}
// TODO maybe unify for nPvs == 1?!
@@ -1921,7 +1915,7 @@ int main (int argc, char *argv[])
ClientFactory::start();
ChannelProvider::shared_pointer provider = getChannelAccess()->getProvider("pvAccess");
ChannelProvider::shared_pointer provider = getChannelAccess()->getProvider("pva");
shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl(quiet));
Channel::shared_pointer channel =

2
testApp/remote/pvget.cpp
View File

@@ -432,7 +432,7 @@ int main (int argc, char *argv[])
}
ClientFactory::start();
ChannelProvider::shared_pointer provider = getChannelAccess()->getProvider("pvAccess");
ChannelProvider::shared_pointer provider = getChannelAccess()->getProvider("pva");
//epics::pvAccess::ca::CAClientFactory::start();
//ChannelProvider::shared_pointer provider = getChannelAccess()->getProvider("ca");

2
testApp/remote/pvinfo.cpp
View File

@@ -122,7 +122,7 @@ int main (int argc, char *argv[])
Requester::shared_pointer requester(new RequesterImpl("pvinfo"));
ClientFactory::start();
ChannelProvider::shared_pointer provider = getChannelAccess()->getProvider("pvAccess");
ChannelProvider::shared_pointer provider = getChannelAccess()->getProvider("pva");
// first connect to all, this allows resource (e.g. TCP connection) sharing
vector<Channel::shared_pointer> channels(nPvs);

2
testApp/remote/pvput.cpp
View File

@@ -860,7 +860,7 @@ int main (int argc, char *argv[])
terseSeparator(fieldSeparator);
ClientFactory::start();
ChannelProvider::shared_pointer provider = getChannelAccess()->getProvider("pvAccess");
ChannelProvider::shared_pointer provider = getChannelAccess()->getProvider("pva");
//epics::pvAccess::ca::CAClientFactory::start();
//ChannelProvider::shared_pointer provider = getChannelAccess()->getProvider("ca");

2
testApp/remote/testChannelConnect.cpp
View File

@@ -72,7 +72,7 @@ int main()
Event g_event;
ClientFactory::start();
ChannelProvider::shared_pointer provider = getChannelAccess()->getProvider("pvAccess");
ChannelProvider::shared_pointer provider = getChannelAccess()->getProvider("pva");
ChannelRequester::shared_pointer channelRequester(new ChannelRequesterImpl(g_event));
Channel::shared_pointer channels[N_CHANNELS];

2
testApp/remote/testGetPerformance.cpp
View File

@@ -472,7 +472,7 @@ int main (int argc, char *argv[])
}
ClientFactory::start();
provider = getChannelAccess()->getProvider("pvAccess");
provider = getChannelAccess()->getProvider("pva");
if (!testFile.empty())
{

2
testApp/remote/testRemoteClientImpl.cpp
View File

@@ -455,7 +455,7 @@ int main()
*/
ClientFactory::start();
ChannelProvider::shared_pointer provider = getChannelAccess()->getProvider("pvAccess");
ChannelProvider::shared_pointer provider = getChannelAccess()->getProvider("pva");
ChannelFindRequester::shared_pointer findRequester(new ChannelFindRequesterImpl());
ChannelFind::shared_pointer channelFind = provider->channelFind("testSomething", findRequester);