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

Convert debug into a file static data member

Browse Source 
MSVC doesn't seem to be able to provide access to it as a
class static, so this fixes the DLL build errors of exampleCPP
This commit is contained in:
Andrew Johnson
2017-11-06 12:57:21 -06:00
parent 64fc25c240
commit 25b621890b
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pv/pvaClient.h
View File

@@ -95,6 +95,7 @@ typedef std::tr1::weak_ptr<PvaClientRPCRequester> PvaClientRPCRequesterWPtr;
class PvaClientChannelCache;
typedef std::tr1::shared_ptr<PvaClientChannelCache> PvaClientChannelCachePtr;
/**
* @brief pvaClient is a synchronous wrapper for the pvAccess API, which is a callback based API.
*
@@ -172,14 +173,13 @@ public:
*
* @param value true or false
*/
static void setDebug(bool value) {debug = value;}
static void setDebug(bool value);
/** @brief Is debug set?
*
* @return true or false
*/
static bool getDebug() {return debug;}
static bool getDebug();
private:
static bool debug;
PvaClient(std::string const & providerNames);
PvaClientChannelCachePtr pvaClientChannelCache;
epics::pvData::Requester::weak_pointer requester;

29
src/pvaClient.cpp
View File

@@ -87,7 +87,18 @@ size_t PvaClientChannelCache::cacheSize()
}
bool PvaClient::debug = false;
// MSVC doesn't like making this a class static data member:
static bool debug = 0;
void PvaClient::setDebug(bool value)
{
debug = value;
}
bool PvaClient::getDebug()
{
return debug;
}
PvaClientPtr PvaClient::get(std::string const & providerNames)
{
@@ -109,19 +120,19 @@ PvaClient::PvaClient(std::string const & providerNames)
{
stringstream ss(providerNames);
string providerName;
if(PvaClient::debug) {
if(getDebug()) {
cout<< "PvaClient::PvaClient()\n";
}
while (getline(ss, providerName, ' '))
{
if(providerName=="pva") {
if(PvaClient::debug) {
if(getDebug()) {
cout<< "calling ClientFactory::start()\n";
}
ClientFactory::start();
pvaStarted = true;
} else if(providerName=="ca") {
if(PvaClient::debug) {
if(getDebug()) {
cout<< "calling CAClientFactory::start()\n";
}
CAClientFactory::start();
@@ -135,20 +146,20 @@ PvaClient::PvaClient(std::string const & providerNames)
}
PvaClient::~PvaClient() {
if(PvaClient::debug) {
if(getDebug()) {
cout<< "PvaClient::~PvaClient()\n"
<< "pvaChannel cache:\n";
showCache();
}
if(pvaStarted){
if(PvaClient::debug) cout<< "calling ClientFactory::stop()\n";
if(getDebug()) cout<< "calling ClientFactory::stop()\n";
ClientFactory::stop();
if(PvaClient::debug) cout<< "after calling ClientFactory::stop()\n";
if(getDebug()) cout<< "after calling ClientFactory::stop()\n";
}
if(caStarted) {
if(PvaClient::debug) cout<< "calling CAClientFactory::stop()\n";
if(getDebug()) cout<< "calling CAClientFactory::stop()\n";
CAClientFactory::stop();
if(PvaClient::debug) cout<< "after calling CAClientFactory::stop()\n";
if(getDebug()) cout<< "after calling CAClientFactory::stop()\n";
}
channelRegistry.reset();
}