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

channelGet, etc now have shared_ptr to Channel

Browse Source
This commit is contained in:
mrkraimer
2017-09-05 06:01:43 -04:00
parent 30650bfa48
commit a652086e91
5 changed files with 58 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ca/caChannel.cpp
+46 -80
View File
@@ -373,7 +373,7 @@ CAChannel::CAChannel(std::string const & _channelName,
{
REFTRACE_INCREMENT(num_instances);
PVACCESS_REFCOUNT_MONITOR_CONSTRUCT(caChannel);
if(CAClientFactory::getDebug()>0) {
if(DEBUG_LEVEL>0) {
cout<< "CAChannel::CAChannel " << channelName << endl;
}
}
@@ -435,7 +435,7 @@ void CAChannel::addChannelMonitor(const CAChannelMonitorPtr & monitor)
CAChannel::~CAChannel()
{
if(CAClientFactory::getDebug()>0) {
if(DEBUG_LEVEL>0) {
cout << "CAChannel::~CAChannel() " << channelName << endl;
}
PVACCESS_REFCOUNT_MONITOR_DESTRUCT(caChannel);
@@ -670,48 +670,41 @@ CAChannelGet::CAChannelGet(CAChannel::shared_pointer const & channel,
lastRequestFlag(false)
{
REFTRACE_INCREMENT(num_instances);
if(CAClientFactory::getDebug()>0) {
if(DEBUG_LEVEL>0) {
cout << "CAChannelGet::CAChannelGet() " << channel->getChannelName() << endl;
}
}
CAChannelGet::~CAChannelGet()
{
if(CAClientFactory::getDebug()>0) {
string channelName("unknown");
CAChannelPtr caChannel(channel.lock());
if(caChannel) channelName = caChannel->getChannelName();
std::cout << "CAChannelGet::~CAChannelGet() " << channelName << endl;
if(DEBUG_LEVEL>0) {
std::cout << "CAChannelGet::~CAChannelGet() " << channel->getChannelName() << endl;
}
REFTRACE_DECREMENT(num_instances);
}
void CAChannelGet::activate()
{
CAChannelPtr caChannel(channel.lock());
if(!caChannel) return;
ChannelGetRequester::shared_pointer getRequester(channelGetRequester.lock());
if(!getRequester) return;
if(pvStructure) throw std::runtime_error("CAChannelGet::activate() was called twice");
getType = getDBRType(pvRequest, caChannel->getNativeType());
pvStructure = createPVStructure(caChannel, getType, pvRequest);
getType = getDBRType(pvRequest, channel->getNativeType());
pvStructure = createPVStructure(channel, getType, pvRequest);
bitSet = BitSetPtr(new BitSet(pvStructure->getStructure()->getNumberFields()));
bitSet->set(0);
caChannel->addChannelGet(shared_from_this());
channel->addChannelGet(shared_from_this());
EXCEPTION_GUARD(getRequester->channelGetConnect(Status::Ok, shared_from_this(),
pvStructure->getStructure()));
}
void CAChannelGet::channelCreated(const Status& status,Channel::shared_pointer const & cl)
{
CAChannelPtr caChannel(channel.lock());
if(!caChannel) return;
ChannelGetRequester::shared_pointer getRequester(channelGetRequester.lock());
if(!getRequester) return;
chtype newType = getDBRType(pvRequest, caChannel->getNativeType());
chtype newType = getDBRType(pvRequest, channel->getNativeType());
if(newType!=getType) {
getType = getDBRType(pvRequest, caChannel->getNativeType());
pvStructure = createPVStructure(caChannel, getType, pvRequest);
getType = getDBRType(pvRequest, channel->getNativeType());
pvStructure = createPVStructure(channel, getType, pvRequest);
bitSet = BitSetPtr(new BitSet(pvStructure->getStructure()->getNumberFields()));
bitSet->set(0);
}
@@ -1126,11 +1119,10 @@ void CAChannelGet::getDone(struct event_handler_args &args)
void CAChannelGet::get()
{
CAChannelPtr caChannel(channel.lock());
if(!caChannel) return;
ChannelGetRequester::shared_pointer getRequester(channelGetRequester.lock());
if(!getRequester) return;
caChannel->threadAttach();
channel->threadAttach();
/*
From R3.14.12 onwards ca_array_get_callback() replies will give a CA client application the current number
@@ -1142,7 +1134,7 @@ void CAChannelGet::get()
int result = ca_array_get_callback(getType,
0,
caChannel->getChannelID(), ca_get_handler, this);
channel->getChannelID(), ca_get_handler, this);
if (result == ECA_NORMAL)
{
ca_flush_io();
@@ -1162,7 +1154,7 @@ void CAChannelGet::get()
Channel::shared_pointer CAChannelGet::getChannel()
{
return channel.lock();
return channel;
}
void CAChannelGet::cancel()
@@ -1196,11 +1188,8 @@ CAChannelPutPtr CAChannelPut::create(
CAChannelPut::~CAChannelPut()
{
if(CAClientFactory::getDebug()>0) {
string channelName("unknown");
CAChannelPtr caChannel(channel.lock());
if(caChannel) channelName = caChannel->getChannelName();
std::cout << "CAChannelPut::~CAChannelPut() " << channelName << endl;
if(DEBUG_LEVEL>0) {
std::cout << "CAChannelPut::~CAChannelPut() " << channel->getChannelName() << endl;
}
REFTRACE_DECREMENT(num_instances);
}
@@ -1218,20 +1207,18 @@ CAChannelPut::CAChannelPut(CAChannel::shared_pointer const & channel,
lastRequestFlag(false)
{
REFTRACE_INCREMENT(num_instances);
if(CAClientFactory::getDebug()>0) {
if(DEBUG_LEVEL>0) {
cout << "CAChannelPut::CAChannePut() " << channel->getChannelName() << endl;
}
}
void CAChannelPut::activate()
{
CAChannelPtr caChannel(channel.lock());
if(!caChannel) return;
ChannelPutRequester::shared_pointer putRequester(channelPutRequester.lock());
if(!putRequester) return;
if(pvStructure) throw std::runtime_error("CAChannelPut::activate() was called twice");
getType = getDBRType(pvRequest,caChannel->getNativeType());
pvStructure = createPVStructure(caChannel, getType, pvRequest);
getType = getDBRType(pvRequest,channel->getNativeType());
pvStructure = createPVStructure(channel, getType, pvRequest);
bitSet = BitSetPtr(new BitSet(pvStructure->getStructure()->getNumberFields()));
PVStringPtr pvString = pvRequest->getSubField<PVString>("record._options.block");
if(pvString) {
@@ -1239,7 +1226,7 @@ void CAChannelPut::activate()
if(val.compare("true")==0) block = true;
}
bitSet->set(pvStructure->getSubFieldT("value")->getFieldOffset());
caChannel->addChannelPut(shared_from_this());
channel->addChannelPut(shared_from_this());
EXCEPTION_GUARD(putRequester->channelPutConnect(Status::Ok, shared_from_this(),
pvStructure->getStructure()));
}
@@ -1247,14 +1234,12 @@ void CAChannelPut::activate()
void CAChannelPut::channelCreated(const Status& status,Channel::shared_pointer const & c)
{
CAChannelPtr caChannel(channel.lock());
if(!caChannel) return;
ChannelPutRequester::shared_pointer putRequester(channelPutRequester.lock());
if(!putRequester) return;
chtype newType = getDBRType(pvRequest, caChannel->getNativeType());
chtype newType = getDBRType(pvRequest, channel->getNativeType());
if(newType!=getType) {
getType = getDBRType(pvRequest, caChannel->getNativeType());
pvStructure = createPVStructure(caChannel, getType, pvRequest);
getType = getDBRType(pvRequest, channel->getNativeType());
pvStructure = createPVStructure(channel, getType, pvRequest);
bitSet = BitSetPtr(new BitSet(pvStructure->getStructure()->getNumberFields()));
PVStringPtr pvString = pvRequest->getSubField<PVString>("record._options.block");
if(pvString) {
@@ -1502,25 +1487,23 @@ void CAChannelPut::putDone(struct event_handler_args &args)
void CAChannelPut::put(PVStructure::shared_pointer const & pvPutStructure,
BitSet::shared_pointer const & /*putBitSet*/)
{
CAChannelPtr caChannel(channel.lock());
if(!caChannel) return;
ChannelPutRequester::shared_pointer putRequester(channelPutRequester.lock());
if(!putRequester) return;
caChannel->threadAttach();
doPut putFunc = doPutFuncTable[caChannel->getNativeType()];
channel->threadAttach();
doPut putFunc = doPutFuncTable[channel->getNativeType()];
if (putFunc)
{
// TODO now we always put all
if(block) {
int result = putFunc(caChannel, this, pvPutStructure);
int result = putFunc(channel, this, pvPutStructure);
if (result != ECA_NORMAL)
{
Status errorStatus(Status::STATUSTYPE_ERROR, string(ca_message(result)));
EXCEPTION_GUARD(putRequester->putDone(errorStatus, shared_from_this()));
}
} else {
int result = putFunc(caChannel,NULL, pvPutStructure);
int result = putFunc(channel,NULL, pvPutStructure);
if (result == ECA_NORMAL)
{
EXCEPTION_GUARD(putRequester->putDone(Status::Ok, shared_from_this()));
@@ -1576,14 +1559,12 @@ void CAChannelPut::getDone(struct event_handler_args &args)
void CAChannelPut::get()
{
CAChannelPtr caChannel(channel.lock());
if(!caChannel) return;
ChannelPutRequester::shared_pointer putRequester(channelPutRequester.lock());
if(!putRequester) return;
caChannel->threadAttach();
channel->threadAttach();
int result = ca_array_get_callback(getType, caChannel->getElementCount(),
caChannel->getChannelID(), ca_put_get_handler, this);
int result = ca_array_get_callback(getType, channel->getElementCount(),
channel->getChannelID(), ca_put_get_handler, this);
if (result == ECA_NORMAL)
{
ca_flush_io();
@@ -1602,7 +1583,7 @@ void CAChannelPut::get()
Channel::shared_pointer CAChannelPut::getChannel()
{
return channel.lock();
return channel;
}
void CAChannelPut::cancel()
@@ -1721,16 +1702,11 @@ CAChannelMonitorPtr CAChannelMonitor::create(
CAChannelMonitor::~CAChannelMonitor()
{
if(CAClientFactory::getDebug()>0) {
string channelName("unknown");
CAChannelPtr caChannel(channel.lock());
if(caChannel) channelName = caChannel->getChannelName();
std::cout << "CAChannelMonitor::~CAChannelMonitor() " << channelName << endl;
if(DEBUG_LEVEL>0) {
std::cout << "CAChannelMonitor::~CAChannelMonitor() " << channel->getChannelName() << endl;
}
CAChannelPtr caChannel(channel.lock());
if(!caChannel) return;
if(!isStarted) return;
caChannel->threadAttach();
channel->threadAttach();
ca_clear_subscription(eventID);
REFTRACE_DECREMENT(num_instances);
}
@@ -1748,20 +1724,18 @@ CAChannelMonitor::CAChannelMonitor(
isStarted(false)
{
REFTRACE_INCREMENT(num_instances);
if(CAClientFactory::getDebug()>0) {
if(DEBUG_LEVEL>0) {
cout << "CAChannelMonitor::CAChannelMonitor() " << channel->getChannelName() << endl;
}
}
void CAChannelMonitor::activate()
{
CAChannelPtr caChannel(channel.lock());
if(!caChannel) return;
MonitorRequester::shared_pointer requester(monitorRequester.lock());
if(!requester) return;
if(pvStructure) throw std::runtime_error("CAChannelMonitor::activate() was called twice");
getType = getDBRType(pvRequest, caChannel->getNativeType());
pvStructure = createPVStructure(caChannel, getType, pvRequest);
getType = getDBRType(pvRequest, channel->getNativeType());
pvStructure = createPVStructure(channel, getType, pvRequest);
int32 queueSize = 2;
PVStructurePtr pvOptions = pvRequest->getSubField<PVStructure>("record._options");
if (pvOptions) {
@@ -1775,21 +1749,19 @@ void CAChannelMonitor::activate()
}
}
monitorQueue = CACMonitorQueuePtr(new CACMonitorQueue(queueSize));
caChannel->addChannelMonitor(shared_from_this());
channel->addChannelMonitor(shared_from_this());
EXCEPTION_GUARD(requester->monitorConnect(Status::Ok, shared_from_this(),
pvStructure->getStructure()));
}
void CAChannelMonitor::channelCreated(const Status& status,Channel::shared_pointer const & c)
{
CAChannelPtr caChannel(channel.lock());
if(!caChannel) return;
MonitorRequester::shared_pointer requester(monitorRequester.lock());
if(!requester) return;
chtype newType = getDBRType(pvRequest, caChannel->getNativeType());
chtype newType = getDBRType(pvRequest, channel->getNativeType());
if(newType!=getType) {
getType = getDBRType(pvRequest, caChannel->getNativeType());
pvStructure = createPVStructure(caChannel, getType, pvRequest);
getType = getDBRType(pvRequest, channel->getNativeType());
pvStructure = createPVStructure(channel, getType, pvRequest);
int32 queueSize = 2;
PVStructurePtr pvOptions = pvRequest->getSubField<PVStructure>("record._options");
if (pvOptions) {
@@ -1854,13 +1826,11 @@ void CAChannelMonitor::subscriptionEvent(struct event_handler_args &args)
epics::pvData::Status CAChannelMonitor::start()
{
Status status = Status::Ok;
CAChannelPtr caChannel(channel.lock());
if(!caChannel) return status;
if(isStarted) {
status = Status(Status::STATUSTYPE_WARNING,"already started");
return status;
}
caChannel->threadAttach();
channel->threadAttach();
/*
From R3.14.12 onwards when using the IOC server and the C++ client libraries monitor callbacks
@@ -1876,7 +1846,7 @@ epics::pvData::Status CAChannelMonitor::start()
// TODO DBE_PROPERTY support
int result = ca_create_subscription(getType,
0,
caChannel->getChannelID(), DBE_VALUE,
channel->getChannelID(), DBE_VALUE,
ca_subscription_handler, this,
&eventID);
if (result == ECA_NORMAL)
@@ -1894,10 +1864,8 @@ epics::pvData::Status CAChannelMonitor::start()
epics::pvData::Status CAChannelMonitor::stop()
{
Status status = Status::Ok;
CAChannelPtr caChannel(channel.lock());
if(!caChannel) return status;
if(!isStarted) return Status(Status::STATUSTYPE_WARNING,"already stopped");
caChannel->threadAttach();
channel->threadAttach();
int result = ca_clear_subscription(eventID);
@@ -1937,10 +1905,8 @@ void CAChannelMonitor::cancel()
void CAChannelMonitor::destroy()
{
CAChannelPtr caChannel(channel.lock());
if(!caChannel) return;
if(!isStarted) return;
caChannel->threadAttach();
channel->threadAttach();
ca_clear_subscription(eventID);
isStarted = false;
}
src/ca/caChannel.h
+3 -4
View File
@@ -24,7 +24,6 @@ namespace ca {
class CAChannel;
typedef std::tr1::shared_ptr<CAChannel> CAChannelPtr;
typedef std::tr1::weak_ptr<CAChannel> CAChannelWPtr;
class CAChannelPut;
typedef std::tr1::shared_ptr<CAChannelPut> CAChannelPutPtr;
typedef std::tr1::weak_ptr<CAChannelPut> CAChannelPutWPtr;
@@ -180,7 +179,7 @@ private:
ChannelGetRequester::shared_pointer const & _channelGetRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest);
CAChannelWPtr channel;
CAChannelPtr channel;
ChannelGetRequester::weak_pointer channelGetRequester;
epics::pvData::PVStructure::shared_pointer pvRequest;
bool lastRequestFlag;
@@ -249,7 +248,7 @@ private:
ChannelPutRequester::shared_pointer const & _channelPutRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest);
CAChannelWPtr channel;
CAChannelPtr channel;
ChannelPutRequester::weak_pointer channelPutRequester;
epics::pvData::PVStructure::shared_pointer pvRequest;
bool block;
@@ -312,7 +311,7 @@ private:
epics::pvData::PVStructure::shared_pointer const & pvRequest);
CAChannelWPtr channel;
CAChannelPtr channel;
MonitorRequester::weak_pointer monitorRequester;
epics::pvData::PVStructure::shared_pointer pvRequest;
bool isStarted;
src/ca/caProvider.cpp
+5 -7
View File
@@ -32,7 +32,7 @@ using namespace epics::pvData;
catch (...) { LOG(logLevelError, "Unhandled exception caught from client code at %s:%d.", __FILE__, __LINE__); }
size_t CAChannelProvider::num_instances;
int CAClientFactory::debug = 0;
CAChannelProvider::CAChannelProvider()
: current_context(0)
{
@@ -41,10 +41,10 @@ CAChannelProvider::CAChannelProvider()
}
CAChannelProvider::CAChannelProvider(const std::tr1::shared_ptr<Configuration>&)
: current_context(0)
: current_context(0)
{
REFTRACE_INCREMENT(num_instances);
if(CAClientFactory::getDebug()>0) {
if(DEBUG_LEVEL>0) {
std::cout<< "CAChannelProvider::CAChannelProvider\n";
}
// Ignoring Configuration as CA only allows config via. environment,
@@ -54,7 +54,7 @@ CAChannelProvider::CAChannelProvider(const std::tr1::shared_ptr<Configuration>&)
CAChannelProvider::~CAChannelProvider()
{
if(CAClientFactory::getDebug()>0) std::cout << "CAChannelProvider::~CAChannelProvider()\n";
if(DEBUG_LEVEL>0) std::cout << "CAChannelProvider::~CAChannelProvider()\n";
REFTRACE_DECREMENT(num_instances);
}
@@ -155,9 +155,7 @@ void CAChannelProvider::initialize()
static
void ca_factory_cleanup(void*)
{
if(CAClientFactory::getDebug()>0) {
std::cout << "ca_factory_cleanup\n";
}
if(DEBUG_LEVEL>0) std::cout << "ca_factory_cleanup\n";
try {
ChannelProviderRegistry::clients()->remove("ca");
ca_context_destroy();
src/ca/caProviderPvt.h
+3
View File
@@ -19,6 +19,8 @@ namespace pvAccess {
class Configuration;
namespace ca {
#define DEBUG_LEVEL 0
class CAChannelProvider;
typedef std::tr1::shared_ptr<CAChannelProvider> CAChannelProviderPtr;
typedef std::tr1::weak_ptr<CAChannelProvider> CAChannelProviderWPtr;
@@ -64,6 +66,7 @@ public:
virtual void destroy();
/* ---------------------------------------------------------------- */
void threadAttach();
src/ca/pv/caProvider.h
+1 -13
View File
@@ -14,6 +14,7 @@ namespace epics {
namespace pvAccess {
class Configuration;
namespace ca {
/**
* @brief CAClientFactory is a channel provider for the ca network provider.
*
@@ -30,19 +31,6 @@ public:
*
*/
static void stop();
/** @brief Should debug info be shown?
*
* @param value level
*/
static void setDebug(int value) {debug = value;}
/** @brief Is debug set?
*
* level = (0,1,2,...) means (no messages, constructor/destructor, ??)
* @return level
*/
static int getDebug() {return debug;}
private:
static int debug;
};
}