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

update pvasr

Browse Source
This commit is contained in:
Michael Davidsaver
2019-07-07 19:36:47 -07:00
parent e0dc94a91d
commit 34009d2a3a
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ioc/PVAServerRegister.cpp
View File

@@ -91,15 +91,19 @@ void stopPVAServer()
void pvasr(int lvl)
{
try {
pvd::Lock G(the_server_lock);
if(!the_server) {
std::cout<<"PVA server not running\n";
return;
} else {
the_server->printInfo(lvl);
pva::ServerContext::shared_pointer serv;
{
pvd::Lock G(the_server_lock);
serv = the_server;
}
if(!serv) {
std::cout<<"PVA server not running\n";
} else {
serv->printInfo(lvl);
}
std::cout.flush();
}catch(std::exception& e){
std::cout<<"Error: "<<e.what()<<"\n";
std::cout<<"Error: "<<e.what()<<std::endl;
}
}

29
src/server/serverContext.cpp
View File

@@ -369,22 +369,19 @@ void ServerContextImpl::printInfo(ostream& str, int lvl)
{
if(lvl==0) {
Lock guard(_mutex);
str << "VERSION : " << getVersion().getVersionString() << endl
<< "PROVIDER_NAMES : ";
for(std::vector<ChannelProvider::shared_pointer>::const_iterator it = _channelProviders.begin();
it != _channelProviders.end(); ++it)
{
str<<(*it)->getProviderName()<<", ";
}
str << endl
<< "BEACON_ADDR_LIST : " << _beaconAddressList << endl
<< "AUTO_BEACON_ADDR_LIST : " << _autoBeaconAddressList << endl
<< "BEACON_PERIOD : " << _beaconPeriod << endl
<< "BROADCAST_PORT : " << _broadcastPort << endl
<< "SERVER_PORT : " << _serverPort << endl
<< "RCV_BUFFER_SIZE : " << _receiveBufferSize << endl
<< "IGNORE_ADDR_LIST: " << _ignoreAddressList << endl
<< "INTF_ADDR_LIST : " << inetAddressToString(_ifaceAddr, false) << endl;
str << getVersion().getVersionString() << "\n"
<< "Active configuration (w/ defaults)\n";
Configuration::shared_pointer conf(getCurrentConfig());
#define SHOW(ENV) str << #ENV " = "<<conf->getPropertyAsString(#ENV, std::string())<<"\n";
SHOW(EPICS_PVAS_INTF_ADDR_LIST)
SHOW(EPICS_PVAS_BEACON_ADDR_LIST)
SHOW(EPICS_PVAS_AUTO_BEACON_ADDR_LIST)
SHOW(EPICS_PVAS_BEACON_PERIOD)
SHOW(EPICS_PVAS_BROADCAST_PORT)
SHOW(EPICS_PVAS_SERVER_PORT)
SHOW(EPICS_PVAS_PROVIDER_NAMES)
#undef SHOW
} else {
// lvl >= 1