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

pvinfo show peerName

Browse Source
This commit is contained in:
Michael Davidsaver
2019-03-11 16:29:21 -07:00
parent ea149f6292
commit b462d82b18
1 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
pvtoolsSrc/pvinfo.cpp
View File

@ -44,18 +44,53 @@ void usage (void)
int haderror; int haderror;
struct GetInfo : public pvac::ClientChannel::InfoCallback, struct GetInfo : public pvac::ClientChannel::InfoCallback,
public pvac::ClientChannel::ConnectCallback,
public Tracker public Tracker
{ {
pvac::ClientChannel chan;
pvac::Operation op; pvac::Operation op;
virtual void infoDone(const pvac::InfoEvent& evt) {
std::string peerName;
explicit GetInfo(pvac::ClientChannel& chan)
:chan(chan)
{
chan.addConnectListener(this);
}
virtual ~GetInfo()
{
chan.removeConnectListener(this);
}
virtual void connectEvent(const pvac::ConnectEvent& evt) OVERRIDE FINAL
{
if(evt.connected) {
Guard G(doneLock);
peerName = evt.peerName;
}
}
virtual void infoDone(const pvac::InfoEvent& evt) OVERRIDE FINAL
{
std::string pname;
{
Guard G(doneLock);
pname = peerName;
}
switch(evt.event) { switch(evt.event) {
case pvac::InfoEvent::Cancel: break; case pvac::InfoEvent::Cancel: break;
case pvac::InfoEvent::Fail: case pvac::InfoEvent::Fail:
std::cerr<<op.name()<<" Error: "<<evt.message<<"\n"; std::cerr<<op.name()<<" Error: "<<evt.message<<"\n";
haderror = 1; haderror = 1;
break; break;
case pvac::InfoEvent::Success: case pvac::InfoEvent::Success: {
std::cout<<op.name()<<" "<<evt.type<<"\n"; std::cout<<op.name()<<"\n"
"Server: "<<pname<<"\n"
"Type:\n";
pvd::format::indent_scope I(std::cout);
std::cout<<evt.type<<"\n";
}
} }
done(); done();
std::cout.flush(); std::cout.flush();
@ -139,8 +174,9 @@ int main (int argc, char *argv[])
pvac::ClientProvider prov(defaultProvider); pvac::ClientProvider prov(defaultProvider);
for(int i = optind; i<argc; i++) { for(int i = optind; i<argc; i++) {
std::tr1::shared_ptr<GetInfo> info(new GetInfo); pvac::ClientChannel chan(prov.connect(argv[i]));
info->op = prov.connect(argv[i]).info(info.get()); std::tr1::shared_ptr<GetInfo> info(new GetInfo(chan));
info->op = chan.info(info.get());
infos.push_back(info); infos.push_back(info);
} }