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

add PvaClient::get; PvaClient::create deprecated

Browse Source
This commit is contained in:
mrkraimer
2016-04-20 11:03:11 -04:00
parent c258018014
commit d2e8fab2b4
2 changed files with 53 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/pvaClient.cpp
View File

@@ -31,44 +31,6 @@ static const string pvaClientName = "pvaClient";
static const string defaultProvider = "pva";
static UnionConstPtr variantUnion = fieldCreate->createVariantUnion();
namespace pvaClientPvt {
static size_t numberPvaClient = 0;
static bool firstTime = true;
static Mutex mutex;
class StartStopClientFactory {
public:
static void PvaClientBeingConstructed()
{
bool saveFirst = false;
{
Lock xx(mutex);
++numberPvaClient;
saveFirst = firstTime;
firstTime = false;
}
if(saveFirst) {
ClientFactory::start();
CAClientFactory::start();
}
}
static void PvaClientBeingDestroyed() {
size_t numLeft = 0;
{
Lock xx(mutex);
--numberPvaClient;
numLeft = numberPvaClient;
}
if(numLeft<=0) {
ClientFactory::stop();
CAClientFactory::stop();
}
}
};
} // namespace pvaClientPvt
class PvaClientChannelCache
{
@@ -141,20 +103,41 @@ size_t PvaClientChannelCache::cacheSize()
}
using namespace epics::pvaClient::pvaClientPvt;
PvaClientPtr PvaClient::create()
PvaClientPtr PvaClient::get(std::string const & providerNames)
{
PvaClientPtr xx(new PvaClient());
StartStopClientFactory::PvaClientBeingConstructed();
return xx;
static PvaClientPtr master;
static Mutex mutex;
Lock xx(mutex);
if(!master) {
master = PvaClientPtr(new PvaClient(providerNames));
}
return master;
}
PvaClient::PvaClient()
: pvaClientChannelCache(new PvaClientChannelCache()),
isDestroyed(false)
PvaClient::PvaClient(std::string const & providerNames)
: pvaClientChannelCache(new PvaClientChannelCache()),
isDestroyed(false),
pvaStarted(false),
caStarted(false)
{
stringstream ss(providerNames);
string providerName;
while (getline(ss, providerName, ' '))
{
ChannelProviderRegistry::shared_pointer registry(getChannelProviderRegistry());
if(providerName=="pva") {
ClientFactory::start();
pvaStarted = true;
} else if(providerName=="ca") {
CAClientFactory::start();
caStarted = true;
} else {
if(!registry->getProvider(providerName)) {
cerr << "PvaClient::get provider " << providerName << " not known" << endl;
}
}
}
}
PvaClient::~PvaClient() {
@@ -169,7 +152,8 @@ void PvaClient::destroy()
isDestroyed = true;
}
pvaClientChannelCache.reset();
StartStopClientFactory::PvaClientBeingDestroyed();
if(pvaStarted) ClientFactory::stop();
if(caStarted) CAClientFactory::stop();
}
string PvaClient:: getRequesterName()