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

pvaTestClient rename Test* -> pvac::*

Browse Source
This commit is contained in:
Michael Davidsaver
2017-07-14 16:31:18 +02:00
parent 6370f11cd2
commit 32d54569c3
10 changed files with 214 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
examples/getme.cpp
View File

@ -40,16 +40,16 @@ void alldone(int num)
}
#endif
struct Getter : public TestClientChannel::GetCallback,
public TestClientChannel::ConnectCallback
struct Getter : public pvac::ClientChannel::GetCallback,
public pvac::ClientChannel::ConnectCallback
{
POINTER_DEFINITIONS(Getter);
const std::string name;
TestClientChannel channel;
TestOperation op;
pvac::ClientChannel channel;
pvac::Operation op;
Getter(TestClientProvider& provider, const std::string& name)
Getter(pvac::ClientProvider& provider, const std::string& name)
:name(name)
,channel(provider.connect(name))
{
@ -61,16 +61,16 @@ struct Getter : public TestClientChannel::GetCallback,
op.cancel();
}
virtual void getDone(const TestGetEvent& event)
virtual void getDone(const pvac::GetEvent& event)
{
switch(event.event) {
case TestGetEvent::Fail:
case pvac::GetEvent::Fail:
std::cout<<"Error "<<name<<" : "<<event.message<<"\n";
break;
case TestGetEvent::Cancel:
case pvac::GetEvent::Cancel:
std::cout<<"Cancel "<<name<<"\n";
break;
case TestGetEvent::Success:
case pvac::GetEvent::Success:
pvd::PVField::const_shared_pointer valfld(event.value->getSubField("value"));
if(!valfld)
valfld = event.value;
@ -79,7 +79,7 @@ struct Getter : public TestClientChannel::GetCallback,
}
}
virtual void connectEvent(const TestConnectEvent& evt)
virtual void connectEvent(const pvac::ConnectEvent& evt)
{
if(evt.connected) {
op = channel.get(this);
@ -144,7 +144,7 @@ int main(int argc, char *argv[]) {
pva::ca::CAClientFactory::start();
std::cout<<"Use provider: "<<providerName<<"\n";
TestClientProvider provider(providerName, conf);
pvac::ClientProvider provider(providerName, conf);
// need to store references to keep get (and channel) from being closed
typedef std::set<Getter::shared_pointer> gets_t;

4
examples/miniget.cpp
View File

@ -19,9 +19,9 @@ int main(int argc, char *argv[])
epics::pvAccess::ClientFactory::start();
TestClientProvider provider("pva");
pvac::ClientProvider provider("pva");
TestClientChannel channel(provider.connect(argv[1]));
pvac::ClientChannel channel(provider.connect(argv[1]));
std::cout<<channel.name()<<" : "<<channel.get()<<"\n";

28
examples/monitorme.cpp
View File

@ -35,7 +35,7 @@ typedef epicsGuardRelease<epicsMutex> UnGuard;
struct Worker {
virtual ~Worker() {}
virtual void process(const TestMonitorEvent& event) =0;
virtual void process(const pvac::MonitorEvent& event) =0;
};
// simple work queue with thread.
@ -46,7 +46,7 @@ struct WorkQueue : public epicsThreadRunable {
typedef std::tr1::weak_ptr<Worker> weak_type;
// work queue holds only weak_ptr
// so jobs must be kept alive seperately
typedef std::deque<std::pair<weak_type, TestMonitorEvent> > queue_t;
typedef std::deque<std::pair<weak_type, pvac::MonitorEvent> > queue_t;
queue_t queue;
epicsEvent event;
bool running;
@ -71,7 +71,7 @@ struct WorkQueue : public epicsThreadRunable {
worker.exitWait();
}
void push(const weak_type& cb, const TestMonitorEvent& evt)
void push(const weak_type& cb, const pvac::MonitorEvent& evt)
{
bool wake;
{
@ -123,7 +123,7 @@ void sigdone(int num)
}
#endif
struct MonTracker : public TestClientChannel::MonitorCallback,
struct MonTracker : public pvac::ClientChannel::MonitorCallback,
public Worker,
public std::tr1::enable_shared_from_this<MonTracker>
{
@ -133,12 +133,12 @@ struct MonTracker : public TestClientChannel::MonitorCallback,
virtual ~MonTracker() {mon.cancel();}
const std::string name;
TestMonitor mon;
pvac::Monitor mon;
virtual void monitorEvent(const TestMonitorEvent& evt) OVERRIDE FINAL
virtual void monitorEvent(const pvac::MonitorEvent& evt) OVERRIDE FINAL
{
// shared_from_this() will fail as Cancel is delivered in our dtor.
if(evt.event==TestMonitorEvent::Cancel) return;
if(evt.event==pvac::MonitorEvent::Cancel) return;
// running on internal provider worker thread
// minimize work here.
@ -146,20 +146,20 @@ struct MonTracker : public TestClientChannel::MonitorCallback,
monwork.push(shared_from_this(), evt);
}
virtual void process(const TestMonitorEvent& evt) OVERRIDE FINAL
virtual void process(const pvac::MonitorEvent& evt) OVERRIDE FINAL
{
// running on our worker thread
switch(evt.event) {
case TestMonitorEvent::Fail:
case pvac::MonitorEvent::Fail:
std::cout<<"Error "<<name<<" "<<evt.message<<"\n";
break;
case TestMonitorEvent::Cancel:
case pvac::MonitorEvent::Cancel:
std::cout<<"Cancel "<<name<<"\n";
break;
case TestMonitorEvent::Disconnect:
case pvac::MonitorEvent::Disconnect:
std::cout<<"Disconnect "<<name<<"\n";
break;
case TestMonitorEvent::Data:
case pvac::MonitorEvent::Data:
{
unsigned n;
for(n=0; n<2 && mon.poll(); n++) {
@ -244,7 +244,7 @@ int main(int argc, char *argv[]) {
pva::ca::CAClientFactory::start();
std::cout<<"Use provider: "<<providerName<<"\n";
TestClientProvider provider(providerName, conf);
pvac::ClientProvider provider(providerName, conf);
std::vector<MonTracker::shared_pointer> monitors;
@ -258,7 +258,7 @@ int main(int argc, char *argv[]) {
MonTracker::shared_pointer mon(new MonTracker(pv));
TestClientChannel chan(provider.connect(pv));
pvac::ClientChannel chan(provider.connect(pv));
mon->mon = chan.monitor(mon.get());

20
examples/putme.cpp
View File

@ -47,14 +47,14 @@ void alldone(int num)
}
#endif
struct PutTracker : public TestClientChannel::PutCallback
struct PutTracker : public pvac::ClientChannel::PutCallback
{
POINTER_DEFINITIONS(PutTracker);
TestOperation op;
pvac::Operation op;
const std::string value;
PutTracker(TestClientChannel& channel,
PutTracker(pvac::ClientChannel& channel,
const pvd::PVStructure::const_shared_pointer& pvReq,
const std::string& value)
:op(channel.put(this, pvReq)) // put() starts here
@ -66,7 +66,7 @@ struct PutTracker : public TestClientChannel::PutCallback
op.cancel();
}
virtual void putBuild(const epics::pvData::StructureConstPtr &build, TestClientChannel::PutCallback::Args& args) OVERRIDE FINAL
virtual void putBuild(const epics::pvData::StructureConstPtr &build, pvac::ClientChannel::PutCallback::Args& args) OVERRIDE FINAL
{
// At this point we have the user provided value string 'value'
// and the server provided structure (with types).
@ -92,16 +92,16 @@ struct PutTracker : public TestClientChannel::PutCallback
std::cout<<"Put value "<<valfld<<" sending="<<args.tosend<<"\n";
}
virtual void putDone(const TestPutEvent &evt) OVERRIDE FINAL
virtual void putDone(const pvac::PutEvent &evt) OVERRIDE FINAL
{
switch(evt.event) {
case TestPutEvent::Fail:
case pvac::PutEvent::Fail:
std::cerr<<op.name()<<" Error: "<<evt.message<<"\n";
break;
case TestPutEvent::Cancel:
case pvac::PutEvent::Cancel:
std::cerr<<op.name()<<" Cancelled\n";
break;
case TestPutEvent::Success:
case pvac::PutEvent::Success:
std::cout<<op.name()<<" Done\n";
}
{
@ -188,7 +188,7 @@ int main(int argc, char *argv[]) {
pva::ca::CAClientFactory::start();
std::cout<<"Use provider: "<<providerName<<"\n";
TestClientProvider provider(providerName, conf);
pvac::ClientProvider provider(providerName, conf);
std::vector<PutTracker::shared_pointer> ops(args.size());
@ -201,7 +201,7 @@ int main(int argc, char *argv[]) {
{
args_t::const_reference arg = args[i];
TestClientChannel chan(provider.connect(arg.first));
pvac::ClientChannel chan(provider.connect(arg.first));
PutTracker::shared_pointer op(new PutTracker(chan, pvReq, arg.second));