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
testApp/remote/eget.cpp
+2 -8
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 =
testApp/remote/pvget.cpp
+1 -1
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");
testApp/remote/pvinfo.cpp
+1 -1
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);
testApp/remote/pvput.cpp
+1 -1
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");
testApp/remote/testChannelConnect.cpp
+1 -1
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];
testApp/remote/testGetPerformance.cpp
+1 -1
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())
{
testApp/remote/testRemoteClientImpl.cpp
+1 -1
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);