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

PVA client ref. loop breaking

Browse Source 
Adjust ownership of BaseRequestImpl sub-classes.
Keep two weak_ptr<>.
one (internal) for tracking relations with Channel.
one (external) for tracking relations w/ user code, and send Q.

external wraps internal, and calls destroy() to break
ref. loops involving internal.

death to m_thisPointer!
This commit is contained in:
Michael Davidsaver
2017-06-07 13:33:10 +02:00
parent 0334483297
commit 8febd176bb
4 changed files with 386 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/pv/monitor.h
View File

@@ -54,7 +54,7 @@ class epicsShareClass MonitorElement {
* This is used by pvAccess to implement monitors.
* @author mrk
*/
class epicsShareClass Monitor : public epics::pvData::Destroyable{
class epicsShareClass Monitor : public virtual epics::pvData::Destroyable{
public:
POINTER_DEFINITIONS(Monitor);
virtual ~Monitor(){}

2
src/client/pv/pvAccess.h
View File

@@ -138,7 +138,7 @@ struct epicsShareClass ChannelBaseRequester : virtual public epics::pvData::Requ
/**
* Base interface for all channel requests (aka. Operations).
*/
class epicsShareClass ChannelRequest : public epics::pvData::Destroyable, public Lockable, private epics::pvData::NoDefaultMethods {
class epicsShareClass ChannelRequest : public virtual epics::pvData::Destroyable, public Lockable, private epics::pvData::NoDefaultMethods {
public:
POINTER_DEFINITIONS(ChannelRequest);

757
src/remoteClient/clientContextImpl.cpp
View File

File diff suppressed because it is too large Load Diff

21
testApp/remote/channelAccessIFTest.cpp
View File

@@ -181,9 +181,9 @@ SyncChannelGetRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateChann
TR1::shared_ptr<SyncChannelGetRequesterImpl>
channelGetReq(new SyncChannelGetRequesterImpl(channel->getChannelName(), debug));
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest(request);
PVStructure::shared_pointer pvRequest = createRequest(request);
channel->createChannelGet(channelGetReq,pvRequest);
ChannelGet::shared_pointer op(channel->createChannelGet(channelGetReq,pvRequest));
bool succStatus = channelGetReq->waitUntilGetDone(getTimeoutSec());
if (!succStatus) {
std::cerr << "[" << channel->getChannelName() << "] failed to get. " << std::endl;
@@ -201,9 +201,9 @@ SyncChannelPutRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateChann
channelPutReq(new SyncChannelPutRequesterImpl(channel->getChannelName(), debug));
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest(request);
PVStructure::shared_pointer pvRequest = createRequest(request);
channel->createChannelPut(channelPutReq,pvRequest);
ChannelPut::shared_pointer op(channel->createChannelPut(channelPutReq,pvRequest));
bool succStatus = channelPutReq->waitUntilConnected(getTimeoutSec());
if (!succStatus) {
@@ -221,9 +221,9 @@ SyncChannelPutGetRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateCh
TR1::shared_ptr<SyncChannelPutGetRequesterImpl>
channelPutGetReq(new SyncChannelPutGetRequesterImpl(debug));
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest(request);
PVStructure::shared_pointer pvRequest = createRequest(request);
channel->createChannelPutGet(channelPutGetReq,pvRequest);
ChannelPutGet::shared_pointer op(channel->createChannelPutGet(channelPutGetReq,pvRequest));
bool succStatus = channelPutGetReq->waitUntilConnected(getTimeoutSec());
if (!succStatus) {
@@ -243,7 +243,7 @@ SyncChannelRPCRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateChann
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest(string());
channel->createChannelRPC(channelRPCReq, pvRequest);
ChannelRPC::shared_pointer op(channel->createChannelRPC(channelRPCReq, pvRequest));
bool succStatus = channelRPCReq->waitUntilConnected(getTimeoutSec());
if (!succStatus) {
@@ -259,9 +259,9 @@ SyncMonitorRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateChannelM
{
TR1::shared_ptr<SyncMonitorRequesterImpl> monitorReq(new SyncMonitorRequesterImpl(debug));
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest(request);
PVStructure::shared_pointer pvRequest = createRequest(request);
channel->createMonitor(monitorReq, pvRequest);
Monitor::shared_pointer op(channel->createMonitor(monitorReq, pvRequest));
bool succStatus = monitorReq->waitUntilConnected(getTimeoutSec());
if (!succStatus) {
@@ -277,7 +277,7 @@ SyncChannelArrayRequesterImpl::shared_pointer ChannelAccessIFTest::syncCreateCha
{
TR1::shared_ptr<SyncChannelArrayRequesterImpl> arrayReq(new SyncChannelArrayRequesterImpl(debug));
channel->createChannelArray(arrayReq, pvRequest);
ChannelArray::shared_pointer op(channel->createChannelArray(arrayReq, pvRequest));
bool succStatus = arrayReq->waitUntilConnected(getTimeoutSec());
if (!succStatus) {
@@ -519,6 +519,7 @@ void ChannelAccessIFTest::test_channelGetNoProcess() {
return;
}
testDiag("start Get");
SyncChannelGetRequesterImpl::shared_pointer channelGetReq = syncCreateChannelGet(channel,request);
if (!channelGetReq.get()) {