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

completed merge

Browse Source
This commit is contained in:
Matej Sekoranja
2014-06-10 00:09:08 +02:00
parent 2150e07da4 c7bf9f6d67
commit 99df13dc72
61 changed files with 3280 additions and 1955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/rpcClient/rpcClient.cpp
View File

@@ -73,7 +73,7 @@ class ChannelRPCRequesterImpl : public ChannelRPCRequester
std::cerr << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
}
virtual void channelRPCConnect(const epics::pvData::Status& status,ChannelRPC::shared_pointer const & channelRPC)
virtual void channelRPCConnect(const epics::pvData::Status& status, ChannelRPC::shared_pointer const & channelRPC)
{
if (status.isSuccess())
{
@@ -97,7 +97,8 @@ class ChannelRPCRequesterImpl : public ChannelRPCRequester
}
}
virtual void requestDone(const epics::pvData::Status &status, epics::pvData::PVStructure::shared_pointer const &pvResponse)
virtual void requestDone(const epics::pvData::Status &status, ChannelRPC::shared_pointer const & /*channelRPC*/,
epics::pvData::PVStructure::shared_pointer const &pvResponse)
{
if (status.isSuccess())
{
@@ -213,7 +214,7 @@ private:
void init()
{
using namespace std::tr1;
m_provider = getChannelAccess()->getProvider("pva");
m_provider = getChannelProviderRegistry()->getProvider("pva");
shared_ptr<ChannelRequesterImpl> channelRequesterImpl(new ChannelRequesterImpl());
m_channelRequesterImpl = channelRequesterImpl;
@@ -250,7 +251,8 @@ PVStructure::shared_pointer RPCClientImpl::request(PVStructure::shared_pointer p
if (rpcRequesterImpl->waitUntilConnected(timeOut))
{
channelRPC->request(pvRequest, true);
channelRPC->lastRequest();
channelRPC->request(pvRequest);
allOK &= rpcRequesterImpl->waitUntilRPC(timeOut);
response = rpcRequesterImpl->response;
}