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

pva client fix getField

Browse Source
This commit is contained in:
Michael Davidsaver
2017-06-28 19:58:00 +02:00
parent 25b81ba506
commit e2a40b1a54
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/remoteClient/clientContextImpl.cpp
View File

@@ -3936,26 +3936,7 @@ public:
* Resubscribe subscriptions.
*/
// TODO to be called from non-transport thread !!!!!!
void resubscribeSubscriptions()
{
Lock guard(m_responseRequestsMutex);
Transport::shared_pointer transport = getTransport();
// NOTE: elements cannot be removed within rrs->updateSubscription callbacks
for (IOIDResponseRequestMap::iterator iter = m_responseRequests.begin();
iter != m_responseRequests.end();
iter++)
{
ResponseRequest::shared_pointer ptr = iter->second.lock();
if (ptr)
{
SubscriptionRequest::shared_pointer rrs = dynamic_pointer_cast<SubscriptionRequest>(ptr);
if (rrs)
EXCEPTION_GUARD(rrs->resubscribeSubscription(transport));
}
}
}
void resubscribeSubscriptions();
/**
* Update subscriptions.
@@ -4788,7 +4769,7 @@ public:
try {
m_channel->checkAndGetTransport()->enqueueSendRequest(shared_from_this());
} catch (std::runtime_error &rte) {
notify(BaseRequestImpl::channelNotConnected, FieldConstPtr());
//notify(BaseRequestImpl::channelNotConnected, FieldConstPtr());
}
}
@@ -4895,6 +4876,31 @@ void InternalClientContextImpl::InternalChannelImpl::getField(GetFieldRequester:
// activate() stores self in channel
}
void InternalClientContextImpl::InternalChannelImpl::resubscribeSubscriptions()
{
Lock guard(m_responseRequestsMutex);
Transport::shared_pointer transport = getTransport();
if(m_getfield) {
transport->enqueueSendRequest(m_getfield);
}
// NOTE: elements cannot be removed within rrs->updateSubscription callbacks
for (IOIDResponseRequestMap::iterator iter = m_responseRequests.begin();
iter != m_responseRequests.end();
iter++)
{
ResponseRequest::shared_pointer ptr = iter->second.lock();
if (ptr)
{
SubscriptionRequest::shared_pointer rrs = dynamic_pointer_cast<SubscriptionRequest>(ptr);
if (rrs)
EXCEPTION_GUARD(rrs->resubscribeSubscription(transport));
}
}
}
}//namespace
namespace epics {
namespace pvAccess {