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

shared_pointer const &

Browse Source
This commit is contained in:
Matej Sekoranja
2011-05-13 14:02:06 +02:00
parent c36ba5264d
commit 1da4173535
37 changed files with 520 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
pvAccessApp/client/pvAccess.h
View File

@@ -98,8 +98,8 @@ namespace epics { namespace pvAccess {
*/
virtual void channelArrayConnect(
const epics::pvData::Status& status,
ChannelArray::shared_pointer& channelArray,
epics::pvData::PVArray::shared_pointer& pvArray) = 0;
ChannelArray::shared_pointer const & channelArray,
epics::pvData::PVArray::shared_pointer const & pvArray) = 0;
/**
* The request is done. This is always called with no locks held.
@@ -144,7 +144,7 @@ namespace epics { namespace pvAccess {
/**
* @param status Completion status.
*/
virtual void channelFindResult(const epics::pvData::Status& status,ChannelFind::shared_pointer& channelFind,bool wasFound) = 0;
virtual void channelFindResult(const epics::pvData::Status& status,ChannelFind::shared_pointer const & channelFind,bool wasFound) = 0;
};
@@ -183,8 +183,8 @@ namespace epics { namespace pvAccess {
* @param pvStructure The PVStructure that holds the data.
* @param bitSet The bitSet for that shows what data has changed.
*/
virtual void channelGetConnect(const epics::pvData::Status& status,ChannelGet::shared_pointer& channelGet,
epics::pvData::PVStructure::shared_pointer& pvStructure,epics::pvData::BitSet::shared_pointer& bitSet) = 0;
virtual void channelGetConnect(const epics::pvData::Status& status,ChannelGet::shared_pointer const & channelGet,
epics::pvData::PVStructure::shared_pointer const & pvStructure,epics::pvData::BitSet::shared_pointer const & bitSet) = 0;
/**
* The request is done. This is always called with no locks held.
@@ -228,7 +228,7 @@ namespace epics { namespace pvAccess {
* @param channelProcess The channelProcess interface or null if the client could not become
* the record processor.
*/
virtual void channelProcessConnect(const epics::pvData::Status& status,ChannelProcess::shared_pointer& channelProcess) = 0;
virtual void channelProcessConnect(const epics::pvData::Status& status,ChannelProcess::shared_pointer const & channelProcess) = 0;
/**
* The process request is done. This is always called with no locks held.
@@ -278,8 +278,8 @@ namespace epics { namespace pvAccess {
* @param pvStructure The PVStructure that holds the data.
* @param bitSet The bitSet for that shows what data has changed.
*/
virtual void channelPutConnect(const epics::pvData::Status& status,ChannelPut::shared_pointer& channelPut,
epics::pvData::PVStructure::shared_pointer& pvStructure,epics::pvData::BitSet::shared_pointer& bitSet) = 0;
virtual void channelPutConnect(const epics::pvData::Status& status,ChannelPut::shared_pointer const & channelPut,
epics::pvData::PVStructure::shared_pointer const & pvStructure,epics::pvData::BitSet::shared_pointer const & bitSet) = 0;
/**
* The request is done. This is always called with no locks held.
@@ -342,8 +342,8 @@ namespace epics { namespace pvAccess {
* @param pvPutStructure The PVStructure that holds the putData.
* @param pvGetStructure The PVStructure that holds the getData.
*/
virtual void channelPutGetConnect(const epics::pvData::Status& status,ChannelPutGet::shared_pointer& channelPutGet,
epics::pvData::PVStructure::shared_pointer& pvPutStructure,epics::pvData::PVStructure::shared_pointer& pvGetStructure) = 0;
virtual void channelPutGetConnect(const epics::pvData::Status& status,ChannelPutGet::shared_pointer const & channelPutGet,
epics::pvData::PVStructure::shared_pointer const & pvPutStructure,epics::pvData::PVStructure::shared_pointer const & pvGetStructure) = 0;
/**
* The putGet request is done. This is always called with no locks held.
* @param status Completion status.
@@ -398,15 +398,15 @@ namespace epics { namespace pvAccess {
* @param pvArgument The argument structure for an RPC request.
* @param bitSet The bitSet for argument changes.
*/
virtual void channelRPCConnect(const epics::pvData::Status& status,ChannelRPC::shared_pointer& channelRPC,
epics::pvData::PVStructure::shared_pointer& pvArgument,epics::pvData::BitSet::shared_pointer& bitSet) = 0;
virtual void channelRPCConnect(const epics::pvData::Status& status,ChannelRPC::shared_pointer const & channelRPC,
epics::pvData::PVStructure::shared_pointer const & pvArgument,epics::pvData::BitSet::shared_pointer const & bitSet) = 0;
/**
* The request is done. This is always called with no locks held.
* @param status Completion status.
* @param pvResponse The response data for the RPC request.
*/
virtual void requestDone(const epics::pvData::Status& status,epics::pvData::PVStructure::shared_pointer& pvResponse) = 0;
virtual void requestDone(const epics::pvData::Status& status,epics::pvData::PVStructure::shared_pointer const & pvResponse) = 0;
};
@@ -425,7 +425,7 @@ namespace epics { namespace pvAccess {
* @param field The Structure for the request.
*/
// TODO naming convention
virtual void getDone(const epics::pvData::Status& status,epics::pvData::FieldConstPtr& field) = 0;
virtual void getDone(const epics::pvData::Status& status,epics::pvData::FieldConstPtr const & field) = 0;
};
@@ -499,7 +499,7 @@ namespace epics { namespace pvAccess {
* @param subField The name of the subField.
* If this is null or an empty epics::pvData::String the returned Field is for the entire record.
*/
virtual void getField(GetFieldRequester::shared_pointer& requester,epics::pvData::String subField) = 0;
virtual void getField(GetFieldRequester::shared_pointer const & requester,epics::pvData::String subField) = 0;
/**
* Get the access rights for a field of a PVStructure created via a call to createPVStructure.
@@ -507,7 +507,7 @@ namespace epics { namespace pvAccess {
* @param pvField The field for which access rights is desired.
* @return The access rights.
*/
virtual AccessRights getAccessRights(epics::pvData::PVField::shared_pointer& pvField) = 0;
virtual AccessRights getAccessRights(epics::pvData::PVField::shared_pointer const & pvField) = 0;
/**
* Create a ChannelProcess.
@@ -519,8 +519,8 @@ namespace epics { namespace pvAccess {
* @return <code>ChannelProcess</code> instance.
*/
virtual ChannelProcess::shared_pointer createChannelProcess(
ChannelProcessRequester::shared_pointer& channelProcessRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest) = 0;
ChannelProcessRequester::shared_pointer const & channelProcessRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest) = 0;
/**
* Create a ChannelGet.
@@ -533,8 +533,8 @@ namespace epics { namespace pvAccess {
* @return <code>ChannelGet</code> instance.
*/
virtual ChannelGet::shared_pointer createChannelGet(
ChannelGetRequester::shared_pointer& channelGetRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest) = 0;
ChannelGetRequester::shared_pointer const & channelGetRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest) = 0;
/**
* Create a ChannelPut.
@@ -547,8 +547,8 @@ namespace epics { namespace pvAccess {
* @return <code>ChannelPut</code> instance.
*/
virtual ChannelPut::shared_pointer createChannelPut(
ChannelPutRequester::shared_pointer& channelPutRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest) = 0;
ChannelPutRequester::shared_pointer const & channelPutRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest) = 0;
/**
* Create a ChannelPutGet.
@@ -561,8 +561,8 @@ namespace epics { namespace pvAccess {
* @return <code>ChannelPutGet</code> instance.
*/
virtual ChannelPutGet::shared_pointer createChannelPutGet(
ChannelPutGetRequester::shared_pointer& channelPutGetRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest) = 0;
ChannelPutGetRequester::shared_pointer const & channelPutGetRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest) = 0;
/**
* Create a ChannelRPC (Remote Procedure Call).
@@ -571,8 +571,8 @@ namespace epics { namespace pvAccess {
* @return <code>ChannelRPC</code> instance.
*/
virtual ChannelRPC::shared_pointer createChannelRPC(
ChannelRPCRequester::shared_pointer& channelRPCRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest) = 0;
ChannelRPCRequester::shared_pointer const & channelRPCRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest) = 0;
/**
* Create a Monitor.
@@ -582,8 +582,8 @@ namespace epics { namespace pvAccess {
* @return <code>Monitor</code> instance.
*/
virtual epics::pvData::Monitor::shared_pointer createMonitor(
epics::pvData::MonitorRequester::shared_pointer& monitorRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest) = 0;
epics::pvData::MonitorRequester::shared_pointer const & monitorRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest) = 0;
/**
* Create a ChannelArray.
@@ -592,8 +592,8 @@ namespace epics { namespace pvAccess {
* @return <code>ChannelArray</code> instance.
*/
virtual ChannelArray::shared_pointer createChannelArray(
ChannelArrayRequester::shared_pointer& channelArrayRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest) = 0;
ChannelArrayRequester::shared_pointer const & channelArrayRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest) = 0;
/**
* Prints detailed information about the context to the standard output stream.
@@ -622,14 +622,14 @@ namespace epics { namespace pvAccess {
* @param status Completion status.
* @param channel The channel.
*/
virtual void channelCreated(const epics::pvData::Status& status, Channel::shared_pointer& channel) = 0;
virtual void channelCreated(const epics::pvData::Status& status, Channel::shared_pointer const & channel) = 0;
/**
* A channel connection state change has occurred.
* @param c The channel.
* @param connectionState The new connection state.
*/
virtual void channelStateChange(Channel::shared_pointer& channel, Channel::ConnectionState connectionState) = 0;
virtual void channelStateChange(Channel::shared_pointer const & channel, Channel::ConnectionState connectionState) = 0;
};
/**
@@ -668,7 +668,7 @@ namespace epics { namespace pvAccess {
* @return An interface for the find.
*/
virtual ChannelFind::shared_pointer channelFind(epics::pvData::String channelName,
ChannelFindRequester::shared_pointer& channelFindRequester) = 0;
ChannelFindRequester::shared_pointer const & channelFindRequester) = 0;
/**
* Create a channel.
@@ -677,7 +677,7 @@ namespace epics { namespace pvAccess {
* @param priority channel priority, must be <code>PRIORITY_MIN</code> <= priority <= <code>PRIORITY_MAX</code>.
* @return <code>Channel</code> instance. If channel does not exist <code>null</code> is returned and <code>channelRequester</code> notified.
*/
virtual Channel::shared_pointer createChannel(epics::pvData::String channelName,ChannelRequester::shared_pointer& channelRequester,
virtual Channel::shared_pointer createChannel(epics::pvData::String channelName,ChannelRequester::shared_pointer const & channelRequester,
short priority = PRIORITY_DEFAULT) = 0;
/**
@@ -688,7 +688,7 @@ namespace epics { namespace pvAccess {
* @param address address (or list of addresses) where to look for a channel. Implementation independed epics::pvData::String.
* @return <code>Channel</code> instance. If channel does not exist <code>null</code> is returned and <code>channelRequester</code> notified.
*/
virtual Channel::shared_pointer createChannel(epics::pvData::String channelName,ChannelRequester::shared_pointer& channelRequester,
virtual Channel::shared_pointer createChannel(epics::pvData::String channelName,ChannelRequester::shared_pointer const & channelRequester,
short priority, epics::pvData::String address) = 0;
};
@@ -720,8 +720,8 @@ namespace epics { namespace pvAccess {
};
extern ChannelAccess::shared_pointer getChannelAccess();
extern void registerChannelProvider(ChannelProvider::shared_pointer& channelProvider);
extern void unregisterChannelProvider(ChannelProvider::shared_pointer& channelProvider);
extern void registerChannelProvider(ChannelProvider::shared_pointer const & channelProvider);
extern void unregisterChannelProvider(ChannelProvider::shared_pointer const & channelProvider);
/**

4
pvAccessApp/factory/ChannelAccessFactory.cpp
View File

@@ -49,12 +49,12 @@ ChannelAccess::shared_pointer getChannelAccess() {
return channelAccess;
}
void registerChannelProvider(ChannelProvider::shared_pointer& channelProvider) {
void registerChannelProvider(ChannelProvider::shared_pointer const & channelProvider) {
Lock guard(channelProviderMutex);
channelProviders[channelProvider->getProviderName()] = channelProvider;
}
void unregisterChannelProvider(ChannelProvider::shared_pointer& channelProvider) {
void unregisterChannelProvider(ChannelProvider::shared_pointer const & channelProvider) {
Lock guard(channelProviderMutex);
channelProviders.erase(channelProvider->getProviderName());
}

2
pvAccessApp/remote/abstractResponseHandler.cpp
View File

@@ -23,7 +23,7 @@ namespace epics {
namespace pvAccess {
void AbstractResponseHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer) {
if(_debug) {
char ipAddrStr[48];

6
pvAccessApp/remote/blockingClientTCPTransport.cpp
View File

@@ -32,7 +32,7 @@ namespace epics {
catch (...) { errlogSevPrintf(errlogMajor, "Unhandled exception caught from code at %s:%d.", __FILE__, __LINE__); }
BlockingClientTCPTransport::BlockingClientTCPTransport(
Context::shared_pointer& context, SOCKET channel,
Context::shared_pointer const & context, SOCKET channel,
auto_ptr<ResponseHandler>& responseHandler, int receiveBufferSize,
TransportClient::shared_pointer client, short remoteTransportRevision,
float beaconInterval, int16 priority) :
@@ -99,7 +99,7 @@ namespace epics {
}
}
bool BlockingClientTCPTransport::acquire(TransportClient::shared_pointer& client) {
bool BlockingClientTCPTransport::acquire(TransportClient::shared_pointer const & client) {
Lock lock(_mutex);
if(_closed) return false;
@@ -153,7 +153,7 @@ namespace epics {
_owners.clear();
}
//void BlockingClientTCPTransport::release(TransportClient::shared_pointer& client) {
//void BlockingClientTCPTransport::release(TransportClient::shared_pointer const & client) {
void BlockingClientTCPTransport::release(pvAccessID clientID) {
Lock lock(_mutex);
if(_closed) return;

4
pvAccessApp/remote/blockingServerTCPTransport.cpp
View File

@@ -26,7 +26,7 @@ namespace epics {
namespace pvAccess {
BlockingServerTCPTransport::BlockingServerTCPTransport(
Context::shared_pointer& context, SOCKET channel,
Context::shared_pointer const & context, SOCKET channel,
auto_ptr<ResponseHandler>& responseHandler, int receiveBufferSize) :
BlockingTCPTransport(context, channel, responseHandler, receiveBufferSize, CA_DEFAULT_PRIORITY),
_introspectionRegistry(true),
@@ -75,7 +75,7 @@ namespace epics {
return sid;
}
void BlockingServerTCPTransport::registerChannel(pvAccessID sid, ServerChannel::shared_pointer& channel) {
void BlockingServerTCPTransport::registerChannel(pvAccessID sid, ServerChannel::shared_pointer const & channel) {
Lock lock(_channelsMutex);
_channels[sid] = channel;
}

30
pvAccessApp/remote/blockingTCP.h
View File

@@ -53,7 +53,7 @@ namespace epics {
public std::tr1::enable_shared_from_this<BlockingTCPTransport>
{
protected:
BlockingTCPTransport(Context::shared_pointer& context, SOCKET channel,
BlockingTCPTransport(Context::shared_pointer const & context, SOCKET channel,
std::auto_ptr<ResponseHandler>& responseHandler, int receiveBufferSize,
int16 priority);
@@ -163,9 +163,9 @@ namespace epics {
*/
void start();
virtual void enqueueSendRequest(TransportSender::shared_pointer& sender);
virtual void enqueueSendRequest(TransportSender::shared_pointer const & sender);
//void enqueueMonitorSendRequest(TransportSender::shared_pointer& sender);
//void enqueueMonitorSendRequest(TransportSender::shared_pointer const & sender);
protected:
@@ -436,13 +436,13 @@ namespace epics {
typedef std::tr1::shared_ptr<const BlockingClientTCPTransport> const_shared_pointer;
private:
BlockingClientTCPTransport(Context::shared_pointer& context, SOCKET channel,
BlockingClientTCPTransport(Context::shared_pointer const & context, SOCKET channel,
std::auto_ptr<ResponseHandler>& responseHandler, int receiveBufferSize,
TransportClient::shared_pointer client, short remoteTransportRevision,
float beaconInterval, int16 priority);
public:
static BlockingClientTCPTransport::shared_pointer create(Context::shared_pointer& context, SOCKET channel,
static BlockingClientTCPTransport::shared_pointer create(Context::shared_pointer const & context, SOCKET channel,
std::auto_ptr<ResponseHandler>& responseHandler, int receiveBufferSize,
TransportClient::shared_pointer client, short remoteTransportRevision,
float beaconInterval, int16 priority)
@@ -472,14 +472,14 @@ namespace epics {
* @param client client (channel) acquiring the transport
* @return <code>true</code> if transport was granted, <code>false</code> otherwise.
*/
virtual bool acquire(TransportClient::shared_pointer& client);
virtual bool acquire(TransportClient::shared_pointer const & client);
/**
* Releases transport.
* @param client client (channel) releasing the transport
*/
virtual void release(pvAccessID clientId);
//virtual void release(TransportClient::shared_pointer& client);
//virtual void release(TransportClient::shared_pointer const & client);
/**
* Alive notification.
@@ -578,12 +578,12 @@ namespace epics {
*/
class BlockingTCPConnector : public Connector {
public:
BlockingTCPConnector(Context::shared_pointer& context, int receiveBufferSize,
BlockingTCPConnector(Context::shared_pointer const & context, int receiveBufferSize,
float beaconInterval);
virtual ~BlockingTCPConnector();
virtual Transport::shared_pointer connect(TransportClient::shared_pointer& client,
virtual Transport::shared_pointer connect(TransportClient::shared_pointer const & client,
std::auto_ptr<ResponseHandler>& responseHandler, osiSockAddr& address,
short transportRevision, int16 priority);
private:
@@ -631,10 +631,10 @@ namespace epics {
typedef std::tr1::shared_ptr<const BlockingServerTCPTransport> const_shared_pointer;
private:
BlockingServerTCPTransport(Context::shared_pointer& context, SOCKET channel,
BlockingServerTCPTransport(Context::shared_pointer const & context, SOCKET channel,
std::auto_ptr<ResponseHandler>& responseHandler, int receiveBufferSize);
public:
static BlockingServerTCPTransport::shared_pointer create(Context::shared_pointer& context, SOCKET channel,
static BlockingServerTCPTransport::shared_pointer create(Context::shared_pointer const & context, SOCKET channel,
std::auto_ptr<ResponseHandler>& responseHandler, int receiveBufferSize)
{
BlockingServerTCPTransport::shared_pointer thisPointer(
@@ -667,7 +667,7 @@ namespace epics {
* @param sid preallocated channel SID.
* @param channel channel to register.
*/
virtual void registerChannel(pvAccessID sid, ServerChannel::shared_pointer& channel);
virtual void registerChannel(pvAccessID sid, ServerChannel::shared_pointer const & channel);
/**
* Unregister a new channel (and deallocates its handle).
@@ -796,8 +796,8 @@ namespace epics {
* @param receiveBufferSize
* @throws CAException
*/
BlockingTCPAcceptor(Context::shared_pointer& context,
ResponseHandlerFactory::shared_pointer& responseHandlerFactory,
BlockingTCPAcceptor(Context::shared_pointer const & context,
ResponseHandlerFactory::shared_pointer const & responseHandlerFactory,
int port, int receiveBufferSize);
virtual ~BlockingTCPAcceptor();
@@ -862,7 +862,7 @@ namespace epics {
* Validate connection by sending a validation message request.
* @return <code>true</code> on success.
*/
bool validateConnection(BlockingServerTCPTransport::shared_pointer& transport, const char* address);
bool validateConnection(BlockingServerTCPTransport::shared_pointer const & transport, const char* address);
static void handleEventsRunner(void* param);
};

6
pvAccessApp/remote/blockingTCPAcceptor.cpp
View File

@@ -23,8 +23,8 @@ namespace epics {
namespace pvAccess {
BlockingTCPAcceptor::BlockingTCPAcceptor(
Context::shared_pointer& context,
ResponseHandlerFactory::shared_pointer& responseHandlerFactory,
Context::shared_pointer const & context,
ResponseHandlerFactory::shared_pointer const & responseHandlerFactory,
int port,
int receiveBufferSize) :
_context(context),
@@ -212,7 +212,7 @@ namespace epics {
} // while
}
bool BlockingTCPAcceptor::validateConnection(BlockingServerTCPTransport::shared_pointer& transport, const char* address) {
bool BlockingTCPAcceptor::validateConnection(BlockingServerTCPTransport::shared_pointer const & transport, const char* address) {
try {
transport->verify();
return true;

4
pvAccessApp/remote/blockingTCPConnector.cpp
View File

@@ -21,7 +21,7 @@ namespace epics {
namespace pvAccess {
BlockingTCPConnector::BlockingTCPConnector(
Context::shared_pointer& context,
Context::shared_pointer const & context,
int receiveBufferSize,
float beaconInterval) :
_context(context),
@@ -66,7 +66,7 @@ namespace epics {
return INVALID_SOCKET;
}
Transport::shared_pointer BlockingTCPConnector::connect(TransportClient::shared_pointer& client,
Transport::shared_pointer BlockingTCPConnector::connect(TransportClient::shared_pointer const & client,
auto_ptr<ResponseHandler>& responseHandler, osiSockAddr& address,
short transportRevision, int16 priority) {

4
pvAccessApp/remote/blockingTCPTransport.cpp
View File

@@ -72,7 +72,7 @@ namespace epics {
PVDATA_REFCOUNT_MONITOR_DEFINE(blockingTCPTransport);
BlockingTCPTransport::BlockingTCPTransport(Context::shared_pointer& context,
BlockingTCPTransport::BlockingTCPTransport(Context::shared_pointer const & context,
SOCKET channel, auto_ptr<ResponseHandler>& responseHandler,
int receiveBufferSize, int16 priority) :
_channel(channel),
@@ -881,7 +881,7 @@ printf("sendThreadRunnner exception\n");
obj->_mutex.unlock();
}
void BlockingTCPTransport::enqueueSendRequest(TransportSender::shared_pointer& sender) {
void BlockingTCPTransport::enqueueSendRequest(TransportSender::shared_pointer const & sender) {
Lock lock(_sendQueueMutex);
if(_closed) return;
_sendQueue.push_back(sender);

6
pvAccessApp/remote/blockingUDP.h
View File

@@ -107,7 +107,7 @@ namespace epics {
// noop
}
virtual void enqueueSendRequest(TransportSender::shared_pointer& sender);
virtual void enqueueSendRequest(TransportSender::shared_pointer const & sender);
void start();
@@ -214,7 +214,7 @@ namespace epics {
private:
static void threadRunner(void* param);
bool processBuffer(Transport::shared_pointer& transport, osiSockAddr& fromAddress, epics::pvData::ByteBuffer* receiveBuffer);
bool processBuffer(Transport::shared_pointer const & transport, osiSockAddr& fromAddress, epics::pvData::ByteBuffer* receiveBuffer);
void close(bool forced, bool waitForThreadToComplete);
@@ -293,7 +293,7 @@ namespace epics {
/**
* NOTE: transport client is ignored for broadcast (UDP).
*/
virtual Transport::shared_pointer connect(TransportClient::shared_pointer& client,
virtual Transport::shared_pointer connect(TransportClient::shared_pointer const & client,
std::auto_ptr<ResponseHandler>& responseHandler, osiSockAddr& bindAddress,
short transportRevision, int16 priority);

2
pvAccessApp/remote/blockingUDPConnector.cpp
View File

@@ -22,7 +22,7 @@ using namespace std;
namespace epics {
namespace pvAccess {
Transport::shared_pointer BlockingUDPConnector::connect(TransportClient::shared_pointer& client,
Transport::shared_pointer BlockingUDPConnector::connect(TransportClient::shared_pointer const & client,
auto_ptr<ResponseHandler>& responseHandler, osiSockAddr& bindAddress,
short transportRevision, int16 priority) {

4
pvAccessApp/remote/blockingUDPTransport.cpp
View File

@@ -99,7 +99,7 @@ namespace epics {
_shutdownEvent.wait();
}
void BlockingUDPTransport::enqueueSendRequest(TransportSender::shared_pointer& sender) {
void BlockingUDPTransport::enqueueSendRequest(TransportSender::shared_pointer const & sender) {
Lock lock(_sendMutex);
_sendToEnabled = false;
@@ -213,7 +213,7 @@ namespace epics {
_shutdownEvent.signal();
}
bool BlockingUDPTransport::processBuffer(Transport::shared_pointer& thisTransport, osiSockAddr& fromAddress, ByteBuffer* receiveBuffer) {
bool BlockingUDPTransport::processBuffer(Transport::shared_pointer const & thisTransport, osiSockAddr& fromAddress, ByteBuffer* receiveBuffer) {
// handle response(s)
while(receiveBuffer->getRemaining()>=CA_MESSAGE_HEADER_SIZE) {

20
pvAccessApp/remote/remote.h
View File

@@ -252,7 +252,7 @@ namespace epics {
* Enqueue send request.
* @param sender
*/
virtual void enqueueSendRequest(TransportSender::shared_pointer& sender) = 0;
virtual void enqueueSendRequest(TransportSender::shared_pointer const & sender) = 0;
};
@@ -307,7 +307,7 @@ namespace epics {
* Code must not manipulate buffer.
*/
virtual void
handleResponse(osiSockAddr* responseFrom, Transport::shared_pointer& transport,
handleResponse(osiSockAddr* responseFrom, Transport::shared_pointer const & transport,
int8 version, int8 command, int payloadSize,
epics::pvData::ByteBuffer* payloadBuffer) = 0;
};
@@ -327,7 +327,7 @@ namespace epics {
virtual ~AbstractResponseHandler() {}
virtual void handleResponse(osiSockAddr* responseFrom, Transport::shared_pointer& transport,
virtual void handleResponse(osiSockAddr* responseFrom, Transport::shared_pointer const & transport,
int8 version, int8 command, int payloadSize,
epics::pvData::ByteBuffer* payloadBuffer);
@@ -369,7 +369,7 @@ namespace epics {
* called to discard <code>transportUnresponsive</code> notification.
* @param transport responsive transport.
*/
virtual void transportResponsive(Transport::shared_pointer& transport) = 0;
virtual void transportResponsive(Transport::shared_pointer const & transport) = 0;
/**
* Notification of network change (server restarted).
@@ -399,7 +399,7 @@ namespace epics {
* @param[in] priority process priority.
* @return transport instance.
*/
virtual Transport::shared_pointer connect(TransportClient::shared_pointer& client,
virtual Transport::shared_pointer connect(TransportClient::shared_pointer const & client,
std::auto_ptr<ResponseHandler>& responseHandler, osiSockAddr& address,
short transportRevision, int16 priority) = 0;
@@ -418,14 +418,14 @@ namespace epics {
* @param client client (channel) acquiring the transport
* @return <code>true</code> if transport was granted, <code>false</code> otherwise.
*/
virtual bool acquire(TransportClient::shared_pointer& client) = 0;
virtual bool acquire(TransportClient::shared_pointer const & client) = 0;
/**
* Releases transport.
* @param client client (channel) releasing the transport
*/
virtual void release(pvAccessID clientId) = 0;
//virtual void release(TransportClient::shared_pointer& client) = 0;
//virtual void release(TransportClient::shared_pointer const & client) = 0;
};
class ServerChannel {
@@ -480,7 +480,7 @@ namespace epics {
* @param sid preallocated channel SID.
* @param channel channel to register.
*/
virtual void registerChannel(pvAccessID sid, ServerChannel::shared_pointer& channel) =0;
virtual void registerChannel(pvAccessID sid, ServerChannel::shared_pointer const & channel) =0;
/**
* Unregister a new channel (and deallocates its handle).
@@ -561,7 +561,7 @@ namespace epics {
* @param version
* @param payloadBuffer
*/
virtual void response(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer) = 0;
virtual void response(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer) = 0;
};
@@ -588,7 +588,7 @@ namespace epics {
* Rescubscribe (e.g. when server was restarted)
* @param transport new transport to be used.
*/
virtual void resubscribeSubscription(Transport::shared_pointer& transport) = 0;
virtual void resubscribeSubscription(Transport::shared_pointer const & transport) = 0;
};

262
pvAccessApp/remoteClient/clientContextImpl.cpp
View File

@@ -117,7 +117,7 @@ namespace epics {
virtual ~BaseRequestImpl() {};
BaseRequestImpl(ChannelImpl::shared_pointer& channel, Requester::shared_pointer requester) :
BaseRequestImpl(ChannelImpl::shared_pointer const & channel, Requester::shared_pointer requester) :
m_channel(channel),
m_requester(requester),
m_destroyed(false),
@@ -167,11 +167,11 @@ namespace epics {
return m_ioid;
}
virtual bool initResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) = 0;
virtual bool destroyResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) = 0;
virtual bool normalResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) = 0;
virtual bool initResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) = 0;
virtual bool destroyResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) = 0;
virtual bool normalResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) = 0;
virtual void response(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer) {
virtual void response(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer) {
transport->ensureData(1);
int8 qos = payloadBuffer->getByte();
@@ -319,7 +319,7 @@ namespace epics {
ChannelProcessRequester::shared_pointer m_callback;
PVStructure::shared_pointer m_pvRequest;
ChannelProcessRequestImpl(ChannelImpl::shared_pointer& channel, ChannelProcessRequester::shared_pointer& callback, PVStructure::shared_pointer& pvRequest) :
ChannelProcessRequestImpl(ChannelImpl::shared_pointer const & channel, ChannelProcessRequester::shared_pointer const & callback, PVStructure::shared_pointer const & pvRequest) :
BaseRequestImpl(channel, static_pointer_cast<Requester>(callback)),
m_callback(callback),
m_pvRequest(pvRequest)
@@ -345,7 +345,7 @@ namespace epics {
}
public:
static ChannelProcess::shared_pointer create(ChannelImpl::shared_pointer& channel, ChannelProcessRequester::shared_pointer& callback, PVStructure::shared_pointer& pvRequest)
static ChannelProcess::shared_pointer create(ChannelImpl::shared_pointer const & channel, ChannelProcessRequester::shared_pointer const & callback, PVStructure::shared_pointer const & pvRequest)
{
ChannelProcess::shared_pointer thisPointer(
new ChannelProcessRequestImpl(channel, callback, pvRequest),
@@ -382,18 +382,18 @@ namespace epics {
stopRequest();
}
virtual bool destroyResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool destroyResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
EXCEPTION_GUARD(m_callback->processDone(status));
return true;
}
virtual bool initResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool initResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
ChannelProcess::shared_pointer thisPtr = dynamic_pointer_cast<ChannelProcess>(shared_from_this());
EXCEPTION_GUARD(m_callback->channelProcessConnect(status, thisPtr));
return true;
}
virtual bool normalResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool normalResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
EXCEPTION_GUARD(m_callback->processDone(status));
return true;
}
@@ -426,7 +426,7 @@ namespace epics {
}
}
virtual void resubscribeSubscription(Transport::shared_pointer& transport) {
virtual void resubscribeSubscription(Transport::shared_pointer const & transport) {
startRequest(QOS_INIT);
TransportSender::shared_pointer thisSender = shared_from_this();
transport->enqueueSendRequest(thisSender);
@@ -458,7 +458,7 @@ namespace epics {
PVStructure::shared_pointer m_data;
BitSet::shared_pointer m_bitSet;
ChannelGetImpl(ChannelImpl::shared_pointer& channel, ChannelGetRequester::shared_pointer& channelGetRequester, PVStructure::shared_pointer& pvRequest) :
ChannelGetImpl(ChannelImpl::shared_pointer const & channel, ChannelGetRequester::shared_pointer const & channelGetRequester, PVStructure::shared_pointer const & pvRequest) :
BaseRequestImpl(channel, static_pointer_cast<Requester>(channelGetRequester)),
m_channelGetRequester(channelGetRequester), m_pvRequest(pvRequest)
{
@@ -493,7 +493,7 @@ namespace epics {
}
public:
static ChannelGet::shared_pointer create(ChannelImpl::shared_pointer& channel, ChannelGetRequester::shared_pointer& channelGetRequester, PVStructure::shared_pointer& pvRequest)
static ChannelGet::shared_pointer create(ChannelImpl::shared_pointer const & channel, ChannelGetRequester::shared_pointer const & channelGetRequester, PVStructure::shared_pointer const & pvRequest)
{
ChannelGet::shared_pointer thisPointer(new ChannelGetImpl(channel, channelGetRequester, pvRequest), delayed_destroyable_deleter());
static_cast<ChannelGetImpl*>(thisPointer.get())->activate();
@@ -527,14 +527,14 @@ namespace epics {
stopRequest();
}
virtual bool destroyResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool destroyResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
// data available
if (qos & QOS_GET)
return normalResponse(transport, version, payloadBuffer, qos, status);
return true;
}
virtual bool initResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool initResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
if (!status.isSuccess())
{
ChannelGet::shared_pointer thisPointer = dynamic_pointer_cast<ChannelGet>(shared_from_this());
@@ -554,7 +554,7 @@ namespace epics {
return true;
}
virtual bool normalResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool normalResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
if (!status.isSuccess())
{
EXCEPTION_GUARD(m_channelGetRequester->getDone(status));
@@ -597,7 +597,7 @@ namespace epics {
}
}
virtual void resubscribeSubscription(Transport::shared_pointer& transport) {
virtual void resubscribeSubscription(Transport::shared_pointer const & transport) {
startRequest(QOS_INIT);
TransportSender::shared_pointer thisSender = shared_from_this();
transport->enqueueSendRequest(thisSender);
@@ -631,7 +631,7 @@ namespace epics {
PVStructure::shared_pointer m_data;
BitSet::shared_pointer m_bitSet;
ChannelPutImpl(ChannelImpl::shared_pointer& channel, ChannelPutRequester::shared_pointer& channelPutRequester, PVStructure::shared_pointer& pvRequest) :
ChannelPutImpl(ChannelImpl::shared_pointer const & channel, ChannelPutRequester::shared_pointer const & channelPutRequester, PVStructure::shared_pointer const & pvRequest) :
BaseRequestImpl(channel, static_pointer_cast<Requester>(channelPutRequester)),
m_channelPutRequester(channelPutRequester), m_pvRequest(pvRequest)
{
@@ -666,7 +666,7 @@ namespace epics {
}
public:
static ChannelPut::shared_pointer create(ChannelImpl::shared_pointer& channel, ChannelPutRequester::shared_pointer& channelPutRequester, PVStructure::shared_pointer& pvRequest)
static ChannelPut::shared_pointer create(ChannelImpl::shared_pointer const & channel, ChannelPutRequester::shared_pointer const & channelPutRequester, PVStructure::shared_pointer const & pvRequest)
{
ChannelPut::shared_pointer thisPointer(new ChannelPutImpl(channel, channelPutRequester, pvRequest), delayed_destroyable_deleter());
static_cast<ChannelPutImpl*>(thisPointer.get())->activate();
@@ -707,12 +707,12 @@ namespace epics {
stopRequest();
}
virtual bool destroyResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool destroyResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
EXCEPTION_GUARD(m_channelPutRequester->putDone(status));
return true;
}
virtual bool initResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool initResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
if (!status.isSuccess())
{
ChannelPut::shared_pointer nullChannelPut;
@@ -732,7 +732,7 @@ namespace epics {
return true;
}
virtual bool normalResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool normalResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
if (qos & QOS_GET)
{
if (!status.isSuccess())
@@ -810,7 +810,7 @@ namespace epics {
}
}
virtual void resubscribeSubscription(Transport::shared_pointer& transport) {
virtual void resubscribeSubscription(Transport::shared_pointer const & transport) {
startRequest(QOS_INIT);
TransportSender::shared_pointer thisSender = shared_from_this();
transport->enqueueSendRequest(thisSender);
@@ -841,7 +841,7 @@ namespace epics {
PVStructure::shared_pointer m_putData;
PVStructure::shared_pointer m_getData;
ChannelPutGetImpl(ChannelImpl::shared_pointer& channel, ChannelPutGetRequester::shared_pointer& channelPutGetRequester, PVStructure::shared_pointer& pvRequest) :
ChannelPutGetImpl(ChannelImpl::shared_pointer const & channel, ChannelPutGetRequester::shared_pointer const & channelPutGetRequester, PVStructure::shared_pointer const & pvRequest) :
BaseRequestImpl(channel, static_pointer_cast<Requester>(channelPutGetRequester)),
m_channelPutGetRequester(channelPutGetRequester), m_pvRequest(pvRequest)
{
@@ -871,7 +871,7 @@ namespace epics {
}
public:
static ChannelPutGet::shared_pointer create(ChannelImpl::shared_pointer& channel, ChannelPutGetRequester::shared_pointer& channelPutGetRequester, PVStructure::shared_pointer& pvRequest)
static ChannelPutGet::shared_pointer create(ChannelImpl::shared_pointer const & channel, ChannelPutGetRequester::shared_pointer const & channelPutGetRequester, PVStructure::shared_pointer const & pvRequest)
{
ChannelPutGet::shared_pointer thisPointer(new ChannelPutGetImpl(channel, channelPutGetRequester, pvRequest), delayed_destroyable_deleter());
static_cast<ChannelPutGetImpl*>(thisPointer.get())->activate();
@@ -915,13 +915,13 @@ namespace epics {
stopRequest();
}
virtual bool destroyResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool destroyResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
// data available
// TODO we need a flag here...
return normalResponse(transport, version, payloadBuffer, qos, status);
}
virtual bool initResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool initResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
if (!status.isSuccess())
{
ChannelPutGet::shared_pointer nullChannelPutGet;
@@ -941,7 +941,7 @@ namespace epics {
}
virtual bool normalResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool normalResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
if (qos & QOS_GET)
{
if (!status.isSuccess())
@@ -1068,7 +1068,7 @@ namespace epics {
}
}
virtual void resubscribeSubscription(Transport::shared_pointer& transport) {
virtual void resubscribeSubscription(Transport::shared_pointer const & transport) {
startRequest(QOS_INIT);
TransportSender::shared_pointer thisSender = shared_from_this();
transport->enqueueSendRequest(thisSender);
@@ -1101,7 +1101,7 @@ namespace epics {
PVStructure::shared_pointer m_data;
BitSet::shared_pointer m_bitSet;
ChannelRPCImpl(ChannelImpl::shared_pointer& channel, ChannelRPCRequester::shared_pointer& channelRPCRequester, PVStructure::shared_pointer& pvRequest) :
ChannelRPCImpl(ChannelImpl::shared_pointer const & channel, ChannelRPCRequester::shared_pointer const & channelRPCRequester, PVStructure::shared_pointer const & pvRequest) :
BaseRequestImpl(channel, static_pointer_cast<Requester>(channelRPCRequester)),
m_channelRPCRequester(channelRPCRequester), m_pvRequest(pvRequest)
{
@@ -1134,7 +1134,7 @@ namespace epics {
}
public:
static ChannelRPC::shared_pointer create(ChannelImpl::shared_pointer& channel, ChannelRPCRequester::shared_pointer& channelRPCRequester, PVStructure::shared_pointer& pvRequest)
static ChannelRPC::shared_pointer create(ChannelImpl::shared_pointer const & channel, ChannelRPCRequester::shared_pointer const & channelRPCRequester, PVStructure::shared_pointer const & pvRequest)
{
ChannelRPC::shared_pointer thisPointer(new ChannelRPCImpl(channel, channelRPCRequester, pvRequest), delayed_destroyable_deleter());
static_cast<ChannelRPCImpl*>(thisPointer.get())->activate();
@@ -1176,13 +1176,13 @@ namespace epics {
stopRequest();
}
virtual bool destroyResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool destroyResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
// data available
// TODO we need a flag here...
return normalResponse(transport, version, payloadBuffer, qos, status);
}
virtual bool initResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool initResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
if (!status.isSuccess())
{
ChannelRPC::shared_pointer nullChannelRPC;
@@ -1202,7 +1202,7 @@ namespace epics {
return true;
}
virtual bool normalResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool normalResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
if (!status.isSuccess())
{
PVStructure::shared_pointer nullPVStructure;
@@ -1248,7 +1248,7 @@ namespace epics {
}
}
virtual void resubscribeSubscription(Transport::shared_pointer& transport) {
virtual void resubscribeSubscription(Transport::shared_pointer const & transport) {
startRequest(QOS_INIT);
TransportSender::shared_pointer thisSender = shared_from_this();
transport->enqueueSendRequest(thisSender);
@@ -1285,7 +1285,7 @@ namespace epics {
int32 m_length;
int32 m_capacity;
ChannelArrayImpl(ChannelImpl::shared_pointer& channel, ChannelArrayRequester::shared_pointer& channelArrayRequester, PVStructure::shared_pointer& pvRequest) :
ChannelArrayImpl(ChannelImpl::shared_pointer const & channel, ChannelArrayRequester::shared_pointer const & channelArrayRequester, PVStructure::shared_pointer const & pvRequest) :
BaseRequestImpl(channel, static_pointer_cast<Requester>(channelArrayRequester)),
m_channelArrayRequester(channelArrayRequester), m_pvRequest(pvRequest),
m_offset(0), m_count(0), m_length(-1), m_capacity(-1)
@@ -1317,7 +1317,7 @@ namespace epics {
}
public:
static ChannelArray::shared_pointer create(ChannelImpl::shared_pointer& channel, ChannelArrayRequester::shared_pointer& channelArrayRequester, PVStructure::shared_pointer& pvRequest)
static ChannelArray::shared_pointer create(ChannelImpl::shared_pointer const & channel, ChannelArrayRequester::shared_pointer const & channelArrayRequester, PVStructure::shared_pointer const & pvRequest)
{
ChannelArray::shared_pointer thisPointer(new ChannelArrayImpl(channel, channelArrayRequester, pvRequest), delayed_destroyable_deleter());
static_cast<ChannelArrayImpl*>(thisPointer.get())->activate();
@@ -1367,14 +1367,14 @@ namespace epics {
stopRequest();
}
virtual bool destroyResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool destroyResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
// data available (get with destroy)
if (qos & QOS_GET)
return normalResponse(transport, version, payloadBuffer, qos, status);
return true;
}
virtual bool initResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool initResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
if (!status.isSuccess())
{
ChannelArray::shared_pointer nullChannelArray;
@@ -1393,7 +1393,7 @@ namespace epics {
return true;
}
virtual bool normalResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool normalResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
if (qos & QOS_GET)
{
if (!status.isSuccess())
@@ -1511,7 +1511,7 @@ namespace epics {
}
virtual void resubscribeSubscription(Transport::shared_pointer& transport) {
virtual void resubscribeSubscription(Transport::shared_pointer const & transport) {
startRequest(QOS_INIT);
TransportSender::shared_pointer thisSender = shared_from_this();
transport->enqueueSendRequest(thisSender);
@@ -1556,7 +1556,7 @@ namespace epics {
ResponseRequest::shared_pointer m_thisPointer;
ChannelGetFieldRequestImpl(ChannelImpl::shared_pointer& channel, GetFieldRequester::shared_pointer& callback, String subField) :
ChannelGetFieldRequestImpl(ChannelImpl::shared_pointer const & channel, GetFieldRequester::shared_pointer const & callback, String subField) :
m_channel(channel),
m_callback(callback),
m_subField(subField),
@@ -1584,7 +1584,7 @@ namespace epics {
}
public:
static ChannelGetFieldRequestImpl::shared_pointer create(ChannelImpl::shared_pointer& channel, GetFieldRequester::shared_pointer& callback, String subField)
static ChannelGetFieldRequestImpl::shared_pointer create(ChannelImpl::shared_pointer const & channel, GetFieldRequester::shared_pointer const & callback, String subField)
{
ChannelGetFieldRequestImpl::shared_pointer thisPointer(new ChannelGetFieldRequestImpl(channel, callback, subField), delayed_destroyable_deleter());
thisPointer->activate();
@@ -1652,7 +1652,7 @@ namespace epics {
m_thisPointer.reset();
}
virtual void response(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer) {
virtual void response(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer) {
Status status;
transport->getIntrospectionRegistry()->deserializeStatus(status, payloadBuffer, transport.get());
@@ -1687,8 +1687,8 @@ namespace epics {
class MonitorStrategy : public Monitor {
public:
virtual ~MonitorStrategy() {};
virtual void init(StructureConstPtr& structure) = 0;
virtual void response(Transport::shared_pointer& transport, ByteBuffer* payloadBuffer) = 0;
virtual void init(StructureConstPtr const & structure) = 0;
virtual void response(Transport::shared_pointer const & transport, ByteBuffer* payloadBuffer) = 0;
};
class MonitorStrategyNotify :
@@ -1702,10 +1702,12 @@ namespace epics {
bool m_gotMonitor;
Mutex m_mutex;
BitSet::shared_pointer nullBitSet;
PVStructure::shared_pointer nullPVStructure;
public:
MonitorStrategyNotify(MonitorRequester::shared_pointer& callback) :
MonitorStrategyNotify(MonitorRequester::shared_pointer const & callback) :
m_callback(callback), m_gotMonitor(false), m_mutex()
{
}
@@ -1714,11 +1716,11 @@ namespace epics {
{
}
virtual void init(StructureConstPtr& structure) {
virtual void init(StructureConstPtr const & structure) {
// noop
}
virtual void response(Transport::shared_pointer& transport, ByteBuffer* payloadBuffer) {
virtual void response(Transport::shared_pointer const & transport, ByteBuffer* payloadBuffer) {
Lock guard(m_mutex);
m_gotMonitor = true;
// no data, only notify
@@ -1726,12 +1728,12 @@ namespace epics {
m_callback->monitorEvent(thisMonitor);
}
virtual MonitorElement::shared_pointer poll() {
virtual MonitorElement::shared_pointer const & poll() {
Lock guard(m_mutex);
return m_gotMonitor ? static_pointer_cast<MonitorElement>(shared_from_this()) : MonitorElement::shared_pointer();
}
virtual void release(MonitorElement::shared_pointer& monitorElement) {
virtual void release(MonitorElement::shared_pointer const & monitorElement) {
Lock guard(m_mutex);
m_gotMonitor = false;
}
@@ -1750,19 +1752,19 @@ namespace epics {
// ============ MonitorElement ============
virtual PVStructure::shared_pointer getPVStructure()
virtual PVStructure::shared_pointer const & getPVStructure()
{
return PVStructure::shared_pointer();
return nullPVStructure;
}
virtual BitSet::shared_pointer getChangedBitSet()
virtual BitSet::shared_pointer const & getChangedBitSet()
{
return BitSet::shared_pointer();
return nullBitSet;
}
virtual BitSet::shared_pointer getOverrunBitSet()
virtual BitSet::shared_pointer const & getOverrunBitSet()
{
return BitSet::shared_pointer();
return nullBitSet;
}
};
@@ -1784,7 +1786,7 @@ namespace epics {
public:
MonitorStrategyEntire(MonitorRequester::shared_pointer& callback) :
MonitorStrategyEntire(MonitorRequester::shared_pointer const & callback) :
m_callback(callback), m_gotMonitor(false), m_mutex()
{
}
@@ -1793,7 +1795,7 @@ namespace epics {
{
}
virtual void init(StructureConstPtr& structure) {
virtual void init(StructureConstPtr const & structure) {
Lock guard(m_mutex);
m_monitorElementStructure.reset(getPVDataCreate()->createPVStructure(0, structure));
@@ -1802,7 +1804,7 @@ namespace epics {
m_monitorElementOverrunBitSet.reset(new BitSet(numberFields));
}
virtual void response(Transport::shared_pointer& transport, ByteBuffer* payloadBuffer) {
virtual void response(Transport::shared_pointer const & transport, ByteBuffer* payloadBuffer) {
Lock guard(m_mutex);
// simply deserialize and notify
m_monitorElementChangeBitSet->deserialize(payloadBuffer, transport.get());
@@ -1813,12 +1815,12 @@ namespace epics {
m_callback->monitorEvent(thisMonitor);
}
virtual MonitorElement::shared_pointer poll() {
virtual MonitorElement::shared_pointer const & poll() {
Lock guard(m_mutex);
return m_gotMonitor ? static_pointer_cast<MonitorElement>(shared_from_this()) : MonitorElement::shared_pointer();
}
virtual void release(MonitorElement::shared_pointer& monitorElement) {
virtual void release(MonitorElement::shared_pointer const & monitorElement) {
Lock guard(m_mutex);
m_gotMonitor = false;
}
@@ -1839,17 +1841,17 @@ namespace epics {
// ============ MonitorElement ============
virtual PVStructure::shared_pointer getPVStructure()
virtual PVStructure::shared_pointer const & getPVStructure()
{
return m_monitorElementStructure;
}
virtual BitSet::shared_pointer getChangedBitSet()
virtual BitSet::shared_pointer const & getChangedBitSet()
{
return m_monitorElementChangeBitSet;
}
virtual BitSet::shared_pointer getOverrunBitSet()
virtual BitSet::shared_pointer const & getOverrunBitSet()
{
return m_monitorElementOverrunBitSet;
}
@@ -1868,6 +1870,8 @@ namespace epics {
bool m_gotMonitor;
Mutex m_mutex;
MonitorElement::shared_pointer nullMonitorElement;
PVStructure::shared_pointer m_monitorElementStructure;
BitSet::shared_pointer m_monitorElementChangeBitSet;
BitSet::shared_pointer m_monitorElementOverrunBitSet;
@@ -1888,7 +1892,7 @@ namespace epics {
{
}
virtual void init(StructureConstPtr& structure) {
virtual void init(StructureConstPtr const & structure) {
Lock guard(m_mutex);
m_monitorElementStructure.reset(getPVDataCreate()->createPVStructure(0, structure));
@@ -1901,7 +1905,7 @@ namespace epics {
}
virtual void response(Transport::shared_pointer& transport, ByteBuffer* payloadBuffer) {
virtual void response(Transport::shared_pointer const & transport, ByteBuffer* payloadBuffer) {
Lock guard(m_mutex);
if (!m_gotMonitor)
@@ -1933,9 +1937,9 @@ namespace epics {
}
}
virtual MonitorElement::shared_pointer poll() {
virtual MonitorElement::shared_pointer const & poll() {
Lock guard(m_mutex);
if (!m_gotMonitor) return MonitorElement::shared_pointer();
if (!m_gotMonitor) return nullMonitorElement;
// compress if needed
if (m_needToCompress)
@@ -1949,7 +1953,7 @@ namespace epics {
return thisMonitorElement;
}
virtual void release(MonitorElement::shared_pointer& monitorElement) {
virtual void release(MonitorElement::shared_pointer const & monitorElement) {
Lock guard(m_mutex);
m_gotMonitor = false;
}
@@ -1974,17 +1978,17 @@ namespace epics {
// ============ MonitorElement ============
virtual PVStructure::shared_pointer getPVStructure()
virtual PVStructure::shared_pointer const & getPVStructure()
{
return m_monitorElementStructure;
}
virtual BitSet::shared_pointer getChangedBitSet()
virtual BitSet::shared_pointer const & getChangedBitSet()
{
return m_monitorElementChangeBitSet;
}
virtual BitSet::shared_pointer getOverrunBitSet()
virtual BitSet::shared_pointer const & getOverrunBitSet()
{
return m_monitorElementOverrunBitSet;
}
@@ -2007,7 +2011,7 @@ namespace epics {
auto_ptr<MonitorStrategy> m_monitorStrategy;
ChannelMonitorImpl(ChannelImpl::shared_pointer& channel, MonitorRequester::shared_pointer& monitorRequester, PVStructure::shared_pointer& pvRequest) :
ChannelMonitorImpl(ChannelImpl::shared_pointer const & channel, MonitorRequester::shared_pointer const & monitorRequester, PVStructure::shared_pointer const & pvRequest) :
BaseRequestImpl(channel, static_pointer_cast<Requester>(monitorRequester)),
m_monitorRequester(monitorRequester),
m_started(false),
@@ -2072,7 +2076,7 @@ namespace epics {
}
public:
static Monitor::shared_pointer create(ChannelImpl::shared_pointer& channel, MonitorRequester::shared_pointer& monitorRequester, PVStructure::shared_pointer& pvRequest)
static Monitor::shared_pointer create(ChannelImpl::shared_pointer const & channel, MonitorRequester::shared_pointer const & monitorRequester, PVStructure::shared_pointer const & pvRequest)
{
Monitor::shared_pointer thisPointer(new ChannelMonitorImpl(channel, monitorRequester, pvRequest), delayed_destroyable_deleter());
static_cast<ChannelMonitorImpl*>(thisPointer.get())->activate();
@@ -2106,13 +2110,13 @@ namespace epics {
stopRequest();
}
virtual bool destroyResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool destroyResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
// data available
// TODO if (qos & QOS_GET)
return normalResponse(transport, version, payloadBuffer, qos, status);
}
virtual bool initResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool initResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
if (!status.isSuccess())
{
Monitor::shared_pointer nullChannelMonitor;
@@ -2138,7 +2142,7 @@ namespace epics {
return true;
}
virtual bool normalResponse(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
virtual bool normalResponse(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer, int8 qos, const Status& status) {
if (qos & QOS_GET)
{
// TODO not supported by IF yet...
@@ -2150,14 +2154,14 @@ namespace epics {
return true;
}
virtual void resubscribeSubscription(Transport::shared_pointer& transport) {
virtual void resubscribeSubscription(Transport::shared_pointer const & transport) {
startRequest(QOS_INIT);
TransportSender::shared_pointer thisSender = shared_from_this();
transport->enqueueSendRequest(thisSender);
}
// override, since we optimize status
virtual void response(Transport::shared_pointer& transport, int8 version, ByteBuffer* payloadBuffer) {
virtual void response(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer) {
transport->ensureData(1);
int8 qos = payloadBuffer->getByte();
@@ -2252,12 +2256,12 @@ namespace epics {
BaseRequestImpl::destroy();
}
virtual MonitorElement::shared_pointer poll()
virtual MonitorElement::shared_pointer const & poll()
{
return m_monitorStrategy->poll();
}
virtual void release(MonitorElement::shared_pointer& monitorElement)
virtual void release(MonitorElement::shared_pointer const & monitorElement)
{
m_monitorStrategy->release(monitorElement);
}
@@ -2270,7 +2274,7 @@ namespace epics {
protected:
ClientContextImpl::weak_pointer _context;
public:
AbstractClientResponseHandler(ClientContextImpl::shared_pointer& context, String description) :
AbstractClientResponseHandler(ClientContextImpl::shared_pointer const & context, String description) :
AbstractResponseHandler(context.get(), description), _context(ClientContextImpl::weak_pointer(context)) {
}
@@ -2280,7 +2284,7 @@ namespace epics {
class NoopResponse : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
public:
NoopResponse(ClientContextImpl::shared_pointer& context, String description) :
NoopResponse(ClientContextImpl::shared_pointer const & context, String description) :
AbstractClientResponseHandler(context, description)
{
}
@@ -2292,7 +2296,7 @@ namespace epics {
class BadResponse : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
public:
BadResponse(ClientContextImpl::shared_pointer& context) :
BadResponse(ClientContextImpl::shared_pointer const & context) :
AbstractClientResponseHandler(context, "Bad response")
{
}
@@ -2301,7 +2305,7 @@ namespace epics {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer)
{
char ipAddrStr[48];
@@ -2316,7 +2320,7 @@ namespace epics {
class DataResponseHandler : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
public:
DataResponseHandler(ClientContextImpl::shared_pointer& context) :
DataResponseHandler(ClientContextImpl::shared_pointer const & context) :
AbstractClientResponseHandler(context, "Data response")
{
}
@@ -2325,7 +2329,7 @@ namespace epics {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer)
{
AbstractClientResponseHandler::handleResponse(responseFrom, transport, version, command, payloadSize, payloadBuffer);
@@ -2345,7 +2349,7 @@ namespace epics {
class SearchResponseHandler : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
public:
SearchResponseHandler(ClientContextImpl::shared_pointer& context) :
SearchResponseHandler(ClientContextImpl::shared_pointer const & context) :
AbstractClientResponseHandler(context, "Search response")
{
}
@@ -2354,7 +2358,7 @@ namespace epics {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer)
{
AbstractClientResponseHandler::handleResponse(responseFrom, transport, version, command, payloadSize, payloadBuffer);
@@ -2408,7 +2412,7 @@ namespace epics {
class BeaconResponseHandler : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
public:
BeaconResponseHandler(ClientContextImpl::shared_pointer& context) :
BeaconResponseHandler(ClientContextImpl::shared_pointer const & context) :
AbstractClientResponseHandler(context, "Beacon")
{
}
@@ -2417,7 +2421,7 @@ namespace epics {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer)
{
// reception timestamp
@@ -2491,7 +2495,7 @@ namespace epics {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer)
{
AbstractClientResponseHandler::handleResponse(responseFrom, transport, version, command, payloadSize, payloadBuffer);
@@ -2512,7 +2516,7 @@ namespace epics {
class MessageHandler : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
public:
MessageHandler(ClientContextImpl::shared_pointer& context) :
MessageHandler(ClientContextImpl::shared_pointer const & context) :
AbstractClientResponseHandler(context, "Message")
{
}
@@ -2521,7 +2525,7 @@ namespace epics {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer)
{
AbstractClientResponseHandler::handleResponse(responseFrom, transport, version, command, payloadSize, payloadBuffer);
@@ -2549,7 +2553,7 @@ namespace epics {
class CreateChannelHandler : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
public:
CreateChannelHandler(ClientContextImpl::shared_pointer& context) :
CreateChannelHandler(ClientContextImpl::shared_pointer const & context) :
AbstractClientResponseHandler(context, "Create channel")
{
}
@@ -2558,7 +2562,7 @@ namespace epics {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer)
{
AbstractClientResponseHandler::handleResponse(responseFrom, transport, version, command, payloadSize, payloadBuffer);
@@ -2609,7 +2613,7 @@ namespace epics {
/**
* @param context
*/
ClientResponseHandler(ClientContextImpl::shared_pointer& context) {
ClientResponseHandler(ClientContextImpl::shared_pointer const & context) {
ResponseHandler::shared_pointer badResponse(new BadResponse(context));
ResponseHandler::shared_pointer dataResponse(new DataResponseHandler(context));
@@ -2639,7 +2643,7 @@ namespace epics {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer)
{
if (command < 0 || command >= (int8)m_handlerTable.size())
@@ -2745,7 +2749,7 @@ namespace epics {
virtual ChannelFind::shared_pointer channelFind(
epics::pvData::String channelName,
ChannelFindRequester::shared_pointer& channelFindRequester)
ChannelFindRequester::shared_pointer const & channelFindRequester)
{
// TODO
m_context->checkChannelName(channelName);
@@ -2761,7 +2765,7 @@ namespace epics {
virtual Channel::shared_pointer createChannel(
epics::pvData::String channelName,
ChannelRequester::shared_pointer& channelRequester,
ChannelRequester::shared_pointer const & channelRequester,
short priority)
{
return createChannel(channelName, channelRequester, priority, emptyString);
@@ -2769,7 +2773,7 @@ namespace epics {
virtual Channel::shared_pointer createChannel(
epics::pvData::String channelName,
ChannelRequester::shared_pointer& channelRequester,
ChannelRequester::shared_pointer const & channelRequester,
short priority,
epics::pvData::String /*address*/)
{
@@ -2894,10 +2898,10 @@ namespace epics {
* @throws CAException
*/
InternalChannelImpl(
ClientContextImpl::shared_pointer& context,
ClientContextImpl::shared_pointer const & context,
pvAccessID channelID,
String& name,
ChannelRequester::shared_pointer& requester,
ChannelRequester::shared_pointer const & requester,
short priority,
auto_ptr<InetAddrVector>& addresses) :
m_context(context),
@@ -3001,7 +3005,7 @@ namespace epics {
return getConnectionState() == CONNECTED;
}
virtual AccessRights getAccessRights(std::tr1::shared_ptr<epics::pvData::PVField>&)
virtual AccessRights getAccessRights(std::tr1::shared_ptr<epics::pvData::PVField> const &)
{
return readWrite;
}
@@ -3031,7 +3035,7 @@ namespace epics {
return m_serverChannelID;
}
virtual void registerResponseRequest(ResponseRequest::shared_pointer& responseRequest)
virtual void registerResponseRequest(ResponseRequest::shared_pointer const & responseRequest)
{
Lock guard(m_responseRequestsMutex);
m_responseRequests[responseRequest->getIOID()] = ResponseRequest::weak_pointer(responseRequest);
@@ -3067,7 +3071,7 @@ namespace epics {
* This method is called after search is complete.
* @param transport
*/
void createChannel(Transport::shared_pointer& transport)
void createChannel(Transport::shared_pointer const & transport)
{
Lock guard(m_channelMutex);
@@ -3333,7 +3337,7 @@ namespace epics {
return m_transport;
}
virtual void transportResponsive(Transport::shared_pointer& transport) {
virtual void transportResponsive(Transport::shared_pointer const & transport) {
Lock guard(m_channelMutex);
if (m_connectionState == DISCONNECTED)
{
@@ -3505,63 +3509,63 @@ namespace epics {
}
}
virtual void getField(GetFieldRequester::shared_pointer& requester,epics::pvData::String subField)
virtual void getField(GetFieldRequester::shared_pointer const & requester,epics::pvData::String subField)
{
ChannelImpl::shared_pointer thisPointer = shared_from_this();
ChannelGetFieldRequestImpl::create(thisPointer, requester, subField);
}
virtual ChannelProcess::shared_pointer createChannelProcess(
ChannelProcessRequester::shared_pointer& channelProcessRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest)
ChannelProcessRequester::shared_pointer const & channelProcessRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
{
ChannelImpl::shared_pointer thisPointer = shared_from_this();
return ChannelProcessRequestImpl::create(thisPointer, channelProcessRequester, pvRequest);
}
virtual ChannelGet::shared_pointer createChannelGet(
ChannelGetRequester::shared_pointer& channelGetRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest)
ChannelGetRequester::shared_pointer const & channelGetRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
{
ChannelImpl::shared_pointer thisPointer = shared_from_this();
return ChannelGetImpl::create(thisPointer, channelGetRequester, pvRequest);
}
virtual ChannelPut::shared_pointer createChannelPut(
ChannelPutRequester::shared_pointer& channelPutRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest)
ChannelPutRequester::shared_pointer const & channelPutRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
{
ChannelImpl::shared_pointer thisPointer = shared_from_this();
return ChannelPutImpl::create(thisPointer, channelPutRequester, pvRequest);
}
virtual ChannelPutGet::shared_pointer createChannelPutGet(
ChannelPutGetRequester::shared_pointer& channelPutGetRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest)
ChannelPutGetRequester::shared_pointer const & channelPutGetRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
{
ChannelImpl::shared_pointer thisPointer = shared_from_this();
return ChannelPutGetImpl::create(thisPointer, channelPutGetRequester, pvRequest);
}
virtual ChannelRPC::shared_pointer createChannelRPC(
ChannelRPCRequester::shared_pointer& channelRPCRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest)
ChannelRPCRequester::shared_pointer const & channelRPCRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
{
ChannelImpl::shared_pointer thisPointer = shared_from_this();
return ChannelRPCImpl::create(thisPointer, channelRPCRequester, pvRequest);
}
virtual epics::pvData::Monitor::shared_pointer createMonitor(
epics::pvData::MonitorRequester::shared_pointer& monitorRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest)
epics::pvData::MonitorRequester::shared_pointer const & monitorRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
{
ChannelImpl::shared_pointer thisPointer = shared_from_this();
return ChannelMonitorImpl::create(thisPointer, monitorRequester, pvRequest);
}
virtual ChannelArray::shared_pointer createChannelArray(
ChannelArrayRequester::shared_pointer& channelArrayRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest)
ChannelArrayRequester::shared_pointer const & channelArrayRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
{
ChannelImpl::shared_pointer thisPointer = shared_from_this();
return ChannelArrayImpl::create(thisPointer, channelArrayRequester, pvRequest);
@@ -3894,7 +3898,7 @@ TODO
* Register channel.
* @param channel
*/
void registerChannel(ChannelImpl::shared_pointer& channel)
void registerChannel(ChannelImpl::shared_pointer const & channel)
{
Lock guard(m_cidMapMutex);
m_channelsByCID[channel->getChannelID()] = ChannelImpl::weak_pointer(channel);
@@ -3904,7 +3908,7 @@ TODO
* Unregister channel.
* @param channel
*/
void unregisterChannel(ChannelImpl::shared_pointer& channel)
void unregisterChannel(ChannelImpl::shared_pointer const & channel)
{
Lock guard(m_cidMapMutex);
m_channelsByCID.erase(channel->getChannelID());
@@ -3965,7 +3969,7 @@ TODO
* @param request request to register.
* @return request ID (IOID).
*/
pvAccessID registerResponseRequest(ResponseRequest::shared_pointer& request)
pvAccessID registerResponseRequest(ResponseRequest::shared_pointer const & request)
{
Lock guard(m_ioidMapMutex);
pvAccessID ioid = generateIOID();
@@ -4045,7 +4049,7 @@ TODO
* @param priority process priority.
* @return transport for given address
*/
Transport::shared_pointer getTransport(TransportClient::shared_pointer& client, osiSockAddr* serverAddress, int16 minorRevision, int16 priority)
Transport::shared_pointer getTransport(TransportClient::shared_pointer const & client, osiSockAddr* serverAddress, int16 minorRevision, int16 priority)
{
try
{
@@ -4066,7 +4070,7 @@ TODO
*/
// TODO no minor version with the addresses
// TODO what if there is an channel with the same name, but on different host!
ChannelImpl::shared_pointer createChannelInternal(String name, ChannelRequester::shared_pointer& requester, short priority,
ChannelImpl::shared_pointer createChannelInternal(String name, ChannelRequester::shared_pointer const & requester, short priority,
auto_ptr<InetAddrVector>& addresses) { // TODO addresses
checkState();
@@ -4107,7 +4111,7 @@ TODO
* @throws CAException
* @throws std::runtime_error
*/
void destroyChannel(ChannelImpl::shared_pointer& channel, bool force) {
void destroyChannel(ChannelImpl::shared_pointer const & channel, bool force) {
String name = channel->getChannelName();
bool lockAcquired = true; //namedLocker->acquireSynchronizationObject(name, LOCK_TIMEOUT);

14
pvAccessApp/remoteClient/clientContextImpl.h
View File

@@ -40,7 +40,7 @@ namespace epics {
virtual std::tr1::shared_ptr<ClientContextImpl> getContext() = 0;
virtual pvAccessID getServerChannelID() = 0;
virtual void registerResponseRequest(ResponseRequest::shared_pointer& responseRequest) = 0;
virtual void registerResponseRequest(ResponseRequest::shared_pointer const & responseRequest) = 0;
virtual void unregisterResponseRequest(pvAccessID ioid) = 0;
virtual Transport::shared_pointer checkAndGetTransport() = 0;
virtual Transport::shared_pointer getTransport() = 0;
@@ -61,18 +61,18 @@ namespace epics {
virtual ChannelSearchManager::shared_pointer getChannelSearchManager() = 0;
virtual void checkChannelName(String& name) = 0;
virtual void registerChannel(ChannelImpl::shared_pointer& channel) = 0;
virtual void unregisterChannel(ChannelImpl::shared_pointer& channel) = 0;
virtual void registerChannel(ChannelImpl::shared_pointer const & channel) = 0;
virtual void unregisterChannel(ChannelImpl::shared_pointer const & channel) = 0;
virtual void destroyChannel(ChannelImpl::shared_pointer& channel, bool force) = 0;
virtual ChannelImpl::shared_pointer createChannelInternal(String name, ChannelRequester::shared_pointer& requester, short priority, std::auto_ptr<InetAddrVector>& addresses) = 0;
virtual void destroyChannel(ChannelImpl::shared_pointer const & channel, bool force) = 0;
virtual ChannelImpl::shared_pointer createChannelInternal(String name, ChannelRequester::shared_pointer const & requester, short priority, std::auto_ptr<InetAddrVector>& addresses) = 0;
virtual ResponseRequest::shared_pointer getResponseRequest(pvAccessID ioid) = 0;
virtual pvAccessID registerResponseRequest(ResponseRequest::shared_pointer& request) = 0;
virtual pvAccessID registerResponseRequest(ResponseRequest::shared_pointer const & request) = 0;
virtual ResponseRequest::shared_pointer unregisterResponseRequest(pvAccessID ioid) = 0;
virtual Transport::shared_pointer getTransport(TransportClient::shared_pointer& client, osiSockAddr* serverAddress, int16 minorRevision, int16 priority) = 0;
virtual Transport::shared_pointer getTransport(TransportClient::shared_pointer const & client, osiSockAddr* serverAddress, int16 minorRevision, int16 priority) = 0;
virtual void beaconAnomalyNotify() = 0;

12
pvAccessApp/server/baseChannelRequester.cpp
View File

@@ -19,10 +19,10 @@ const Status BaseChannelRequester::otherRequestPendingStatus = Status(Status::ST
const int32 BaseChannelRequester::NULL_REQUEST = -1;
BaseChannelRequester::BaseChannelRequester(
ServerContextImpl::shared_pointer& context,
ServerChannelImpl::shared_pointer& channel,
ServerContextImpl::shared_pointer const & context,
ServerChannelImpl::shared_pointer const & channel,
const pvAccessID ioid,
Transport::shared_pointer& transport) :
Transport::shared_pointer const & transport) :
_ioid(ioid),
_transport(transport),
_channel(channel),
@@ -67,13 +67,13 @@ void BaseChannelRequester::message(const String message, const epics::pvData::Me
BaseChannelRequester::message(_transport, _ioid, message, messageType);
}
void BaseChannelRequester::message(Transport::shared_pointer& transport, const pvAccessID ioid, const String message, const MessageType messageType)
void BaseChannelRequester::message(Transport::shared_pointer const & transport, const pvAccessID ioid, const String message, const MessageType messageType)
{
TransportSender::shared_pointer sender(new BaseChannelRequesterMessageTransportSender(ioid, message, messageType));
transport->enqueueSendRequest(sender);
}
void BaseChannelRequester::sendFailureMessage(const int8 command, Transport::shared_pointer& transport, const pvAccessID ioid, const int8 qos, const Status status)
void BaseChannelRequester::sendFailureMessage(const int8 command, Transport::shared_pointer const & transport, const pvAccessID ioid, const int8 qos, const Status status)
{
TransportSender::shared_pointer sender(new BaseChannelRequesterFailureMessageTransportSender(command, transport, ioid, qos, status));
transport->enqueueSendRequest(sender);
@@ -105,7 +105,7 @@ void BaseChannelRequesterMessageTransportSender::unlock()
}
BaseChannelRequesterFailureMessageTransportSender::BaseChannelRequesterFailureMessageTransportSender(const int8 command,
Transport::shared_pointer& transport, const pvAccessID ioid, const int8 qos, const Status& status) :
Transport::shared_pointer const & transport, const pvAccessID ioid, const int8 qos, const Status& status) :
_command(command),
_ioid(ioid),
_qos(qos),

10
pvAccessApp/server/baseChannelRequester.h
View File

@@ -17,8 +17,8 @@ namespace pvAccess {
class BaseChannelRequester : virtual public epics::pvData::Requester, public epics::pvData::Destroyable
{
public:
BaseChannelRequester(ServerContextImpl::shared_pointer& context, ServerChannelImpl::shared_pointer& channel,
const pvAccessID ioid, Transport::shared_pointer& transport);
BaseChannelRequester(ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel,
const pvAccessID ioid, Transport::shared_pointer const & transport);
virtual ~BaseChannelRequester() {};
bool startRequest(int32 qos);
@@ -26,8 +26,8 @@ public:
int32 getPendingRequest();
String getRequesterName();
void message(const String message, const epics::pvData::MessageType messageType);
static void message(Transport::shared_pointer& transport, const pvAccessID ioid, const String message, const epics::pvData::MessageType messageType);
static void sendFailureMessage(const int8 command, Transport::shared_pointer& transport, const pvAccessID ioid, const int8 qos, const Status status);
static void message(Transport::shared_pointer const & transport, const pvAccessID ioid, const String message, const epics::pvData::MessageType messageType);
static void sendFailureMessage(const int8 command, Transport::shared_pointer const & transport, const pvAccessID ioid, const int8 qos, const Status status);
static const Status okStatus;
static const Status badCIDStatus;
@@ -63,7 +63,7 @@ private:
class BaseChannelRequesterFailureMessageTransportSender : public TransportSender
{
public:
BaseChannelRequesterFailureMessageTransportSender(const int8 command, Transport::shared_pointer& transport, const pvAccessID ioid, const int8 qos, const Status& status);
BaseChannelRequesterFailureMessageTransportSender(const int8 command, Transport::shared_pointer const & transport, const pvAccessID ioid, const int8 qos, const Status& status);
void send(epics::pvData::ByteBuffer* buffer, TransportSendControl* control);
void lock();
void unlock();

6
pvAccessApp/server/beaconEmitter.cpp
View File

@@ -18,8 +18,8 @@ namespace epics { namespace pvAccess {
const float BeaconEmitter::EPICS_CA_MIN_BEACON_PERIOD = 1.0;
const float BeaconEmitter::EPICS_CA_MIN_BEACON_COUNT_LIMIT = 3.0;
//BeaconEmitter::BeaconEmitter(Transport::shared_pointer& transport, ServerContextImpl::shared_pointer& context) :
BeaconEmitter::BeaconEmitter(Transport::shared_pointer& transport, std::tr1::shared_ptr<ServerContextImpl>& context) :
//BeaconEmitter::BeaconEmitter(Transport::shared_pointer const & transport, ServerContextImpl::shared_pointer const & context) :
BeaconEmitter::BeaconEmitter(Transport::shared_pointer const & transport, std::tr1::shared_ptr<ServerContextImpl>& context) :
_transport(transport),
_beaconSequenceID(0),
_startupTime(),
@@ -35,7 +35,7 @@ BeaconEmitter::BeaconEmitter(Transport::shared_pointer& transport, std::tr1::sha
_startupTime.getCurrent();
}
BeaconEmitter::BeaconEmitter(Transport::shared_pointer& transport, const osiSockAddr& serverAddress) :
BeaconEmitter::BeaconEmitter(Transport::shared_pointer const & transport, const osiSockAddr& serverAddress) :
_transport(transport),
_beaconSequenceID(0),
_startupTime(),

6
pvAccessApp/server/beaconEmitter.h
View File

@@ -38,14 +38,14 @@ namespace epics { namespace pvAccess {
* @param transport transport to be used to send beacons.
* @param context CA context.
*/
// BeaconEmitter(Transport::shared_pointer& transport, ServerContextImpl::shared_pointer& context);
BeaconEmitter(Transport::shared_pointer& transport, std::tr1::shared_ptr<ServerContextImpl>& context);
// BeaconEmitter(Transport::shared_pointer const & transport, ServerContextImpl::shared_pointer const & context);
BeaconEmitter(Transport::shared_pointer const & transport, std::tr1::shared_ptr<ServerContextImpl>& context);
/**
* Test Constructor (ohne context)
* @param transport transport to be used to send beacons.
*/
BeaconEmitter(Transport::shared_pointer& transport, const osiSockAddr& serverAddress);
BeaconEmitter(Transport::shared_pointer const & transport, const osiSockAddr& serverAddress);
virtual ~BeaconEmitter();

2
pvAccessApp/server/beaconServerStatusProvider.cpp
View File

@@ -9,7 +9,7 @@ using namespace epics::pvData;
namespace epics { namespace pvAccess {
DefaultBeaconServerStatusProvider::DefaultBeaconServerStatusProvider(ServerContext::shared_pointer& context): _context(context)
DefaultBeaconServerStatusProvider::DefaultBeaconServerStatusProvider(ServerContext::shared_pointer const & context): _context(context)
{
initialize();
}

4
pvAccessApp/server/beaconServerStatusProvider.h
View File

@@ -38,8 +38,8 @@ namespace epics { namespace pvAccess {
* Constructor.
* @param context CA context.
*/
// DefaultBeaconServerStatusProvider(ServerContext::shared_pointer& context);
DefaultBeaconServerStatusProvider(std::tr1::shared_ptr<ServerContext>& context);
// DefaultBeaconServerStatusProvider(ServerContext::shared_pointer const & context);
DefaultBeaconServerStatusProvider(std::tr1::shared_ptr<ServerContext> const & context);
/**
* Destructor.
*/

152
pvAccessApp/server/responseHandlers.cpp
View File

@@ -25,7 +25,7 @@ namespace epics {
namespace pvAccess {
void ServerBadResponse::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer)
{
AbstractServerResponseHandler::handleResponse(responseFrom,
@@ -40,7 +40,7 @@ void ServerBadResponse::handleResponse(osiSockAddr* responseFrom,
}
ServerResponseHandler::ServerResponseHandler(ServerContextImpl::shared_pointer& context)
ServerResponseHandler::ServerResponseHandler(ServerContextImpl::shared_pointer const & context)
{
ResponseHandler::shared_pointer badResponse(new ServerBadResponse(context));
@@ -71,7 +71,7 @@ ServerResponseHandler::ServerResponseHandler(ServerContextImpl::shared_pointer&
}
void ServerResponseHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer)
{
if(command<0||command>=(int8)m_handlerTable.size())
@@ -95,7 +95,7 @@ void ServerResponseHandler::handleResponse(osiSockAddr* responseFrom,
}
void ServerConnectionValidationHandler::handleResponse(
osiSockAddr* responseFrom, Transport::shared_pointer& transport, int8 version,
osiSockAddr* responseFrom, Transport::shared_pointer const & transport, int8 version,
int8 command, int payloadSize,
ByteBuffer* payloadBuffer)
{
@@ -113,7 +113,7 @@ void ServerConnectionValidationHandler::handleResponse(
}
void ServerEchoHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer)
{
AbstractServerResponseHandler::handleResponse(responseFrom,
@@ -125,7 +125,7 @@ void ServerEchoHandler::handleResponse(osiSockAddr* responseFrom,
}
void ServerIntrospectionSearchHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer)
{
AbstractServerResponseHandler::handleResponse(responseFrom,
@@ -136,7 +136,7 @@ void ServerIntrospectionSearchHandler::handleResponse(osiSockAddr* responseFrom,
/****************************************************************************************/
ServerSearchHandler::ServerSearchHandler(ServerContextImpl::shared_pointer& context) :
ServerSearchHandler::ServerSearchHandler(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "Search request"), _provider(context->getChannelProvider())
{
}
@@ -146,7 +146,7 @@ ServerSearchHandler::~ServerSearchHandler()
}
void ServerSearchHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer)
{
AbstractServerResponseHandler::handleResponse(responseFrom,
@@ -174,7 +174,7 @@ void ServerSearchHandler::handleResponse(osiSockAddr* responseFrom,
}
}
ServerChannelFindRequesterImpl::ServerChannelFindRequesterImpl(ServerContextImpl::shared_pointer& context) :
ServerChannelFindRequesterImpl::ServerChannelFindRequesterImpl(ServerContextImpl::shared_pointer const & context) :
_sendTo(NULL),
_context(context)
{}
@@ -195,7 +195,7 @@ ServerChannelFindRequesterImpl* ServerChannelFindRequesterImpl::set(int32 search
return this;
}
void ServerChannelFindRequesterImpl::channelFindResult(const Status& status, ChannelFind::shared_pointer& channelFind, bool wasFound)
void ServerChannelFindRequesterImpl::channelFindResult(const Status& status, ChannelFind::shared_pointer const & channelFind, bool wasFound)
{
// TODO status
Lock guard(_mutex);
@@ -237,7 +237,7 @@ void ServerChannelFindRequesterImpl::send(ByteBuffer* buffer, TransportSendContr
/****************************************************************************************/
void ServerCreateChannelHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer)
{
AbstractServerResponseHandler::handleResponse(responseFrom,
@@ -274,12 +274,12 @@ void ServerCreateChannelHandler::handleResponse(osiSockAddr* responseFrom,
ServerChannelRequesterImpl::create(_provider, transport, channelName, cid);
}
void ServerCreateChannelHandler::disconnect(Transport::shared_pointer& transport)
void ServerCreateChannelHandler::disconnect(Transport::shared_pointer const & transport)
{
transport->close(true);
}
ServerChannelRequesterImpl::ServerChannelRequesterImpl(Transport::shared_pointer& transport,
ServerChannelRequesterImpl::ServerChannelRequesterImpl(Transport::shared_pointer const & transport,
const String channelName, const pvAccessID cid) :
_transport(transport),
_channelName(channelName),
@@ -290,7 +290,7 @@ ServerChannelRequesterImpl::ServerChannelRequesterImpl(Transport::shared_pointer
}
ChannelRequester::shared_pointer ServerChannelRequesterImpl::create(
ChannelProvider::shared_pointer& provider, Transport::shared_pointer& transport,
ChannelProvider::shared_pointer const & provider, Transport::shared_pointer const & transport,
const String channelName, const pvAccessID cid)
{
ChannelRequester::shared_pointer cr(new ServerChannelRequesterImpl(transport, channelName, cid));
@@ -299,7 +299,7 @@ ChannelRequester::shared_pointer ServerChannelRequesterImpl::create(
return cr;
}
void ServerChannelRequesterImpl::channelCreated(const Status& status, Channel::shared_pointer& channel)
void ServerChannelRequesterImpl::channelCreated(const Status& status, Channel::shared_pointer const & channel)
{
Lock guard(_mutex);
_status = status;
@@ -308,7 +308,7 @@ void ServerChannelRequesterImpl::channelCreated(const Status& status, Channel::s
_transport->enqueueSendRequest(thisSender);
}
void ServerChannelRequesterImpl::channelStateChange(Channel::shared_pointer& c, const Channel::ConnectionState isConnected)
void ServerChannelRequesterImpl::channelStateChange(Channel::shared_pointer const & c, const Channel::ConnectionState isConnected)
{
//noop
}
@@ -413,7 +413,7 @@ void ServerChannelRequesterImpl::createChannelFailedResponse(ByteBuffer* buffer,
/****************************************************************************************/
void ServerDestroyChannelHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer)
{
AbstractServerResponseHandler::handleResponse(responseFrom,
@@ -454,7 +454,7 @@ void ServerDestroyChannelHandler::handleResponse(osiSockAddr* responseFrom,
/****************************************************************************************/
void ServerGetHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer)
{
AbstractServerResponseHandler::handleResponse(responseFrom,
@@ -522,21 +522,21 @@ void ServerGetHandler::handleResponse(osiSockAddr* responseFrom,
destroy(); \
}
ServerChannelGetRequesterImpl::ServerChannelGetRequesterImpl(ServerContextImpl::shared_pointer& context, ServerChannelImpl::shared_pointer& channel, const pvAccessID ioid, Transport::shared_pointer& transport) :
ServerChannelGetRequesterImpl::ServerChannelGetRequesterImpl(ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid, Transport::shared_pointer const & transport) :
BaseChannelRequester(context, channel, ioid, transport), _channelGet(), _bitSet(), _pvStructure()
{
}
ChannelGetRequester::shared_pointer ServerChannelGetRequesterImpl::create(ServerContextImpl::shared_pointer& context, ServerChannelImpl::shared_pointer& channel, const pvAccessID ioid, Transport::shared_pointer& transport,
PVStructure::shared_pointer& pvRequest)
ChannelGetRequester::shared_pointer ServerChannelGetRequesterImpl::create(ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid, Transport::shared_pointer const & transport,
PVStructure::shared_pointer const & pvRequest)
{
ChannelGetRequester::shared_pointer thisPointer(new ServerChannelGetRequesterImpl(context, channel, ioid, transport));
static_cast<ServerChannelGetRequesterImpl*>(thisPointer.get())->activate(pvRequest);
return thisPointer;
}
void ServerChannelGetRequesterImpl::activate(PVStructure::shared_pointer& pvRequest)
void ServerChannelGetRequesterImpl::activate(PVStructure::shared_pointer const & pvRequest)
{
startRequest(QOS_INIT);
ChannelGetRequester::shared_pointer thisPointer = shared_from_this();
@@ -545,7 +545,7 @@ void ServerChannelGetRequesterImpl::activate(PVStructure::shared_pointer& pvRequ
INIT_EXCEPTION_GUARD(CMD_GET, _channelGet = _channel->getChannel()->createChannelGet(thisPointer, pvRequest));
}
void ServerChannelGetRequesterImpl::channelGetConnect(const Status& status, ChannelGet::shared_pointer& channelGet, PVStructure::shared_pointer& pvStructure, BitSet::shared_pointer& bitSet)
void ServerChannelGetRequesterImpl::channelGetConnect(const Status& status, ChannelGet::shared_pointer const & channelGet, PVStructure::shared_pointer const & pvStructure, BitSet::shared_pointer const & bitSet)
{
{
Lock guard(_mutex);
@@ -639,7 +639,7 @@ void ServerChannelGetRequesterImpl::send(ByteBuffer* buffer, TransportSendContro
}
/****************************************************************************************/
void ServerPutHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer) {
AbstractServerResponseHandler::handleResponse(responseFrom,
transport, version, command, payloadSize, payloadBuffer);
@@ -705,21 +705,21 @@ void ServerPutHandler::handleResponse(osiSockAddr* responseFrom,
}
}
ServerChannelPutRequesterImpl::ServerChannelPutRequesterImpl(ServerContextImpl::shared_pointer& context, ServerChannelImpl::shared_pointer& channel,
const pvAccessID ioid, Transport::shared_pointer& transport):
ServerChannelPutRequesterImpl::ServerChannelPutRequesterImpl(ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel,
const pvAccessID ioid, Transport::shared_pointer const & transport):
BaseChannelRequester(context, channel, ioid, transport), _channelPut(), _bitSet(), _pvStructure()
{
}
ChannelPutRequester::shared_pointer ServerChannelPutRequesterImpl::create(ServerContextImpl::shared_pointer& context, ServerChannelImpl::shared_pointer& channel,
const pvAccessID ioid, Transport::shared_pointer& transport, PVStructure::shared_pointer& pvRequest)
ChannelPutRequester::shared_pointer ServerChannelPutRequesterImpl::create(ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel,
const pvAccessID ioid, Transport::shared_pointer const & transport, PVStructure::shared_pointer const & pvRequest)
{
ChannelPutRequester::shared_pointer thisPointer(new ServerChannelPutRequesterImpl(context, channel, ioid, transport));
static_cast<ServerChannelPutRequesterImpl*>(thisPointer.get())->activate(pvRequest);
return thisPointer;
}
void ServerChannelPutRequesterImpl::activate(PVStructure::shared_pointer& pvRequest)
void ServerChannelPutRequesterImpl::activate(PVStructure::shared_pointer const & pvRequest)
{
startRequest(QOS_INIT);
ChannelPutRequester::shared_pointer thisPointer = shared_from_this();
@@ -728,7 +728,7 @@ void ServerChannelPutRequesterImpl::activate(PVStructure::shared_pointer& pvRequ
INIT_EXCEPTION_GUARD(CMD_PUT, _channelPut = _channel->getChannel()->createChannelPut(thisPointer, pvRequest));
}
void ServerChannelPutRequesterImpl::channelPutConnect(const Status& status, ChannelPut::shared_pointer& channelPut, PVStructure::shared_pointer& pvStructure, BitSet::shared_pointer& bitSet)
void ServerChannelPutRequesterImpl::channelPutConnect(const Status& status, ChannelPut::shared_pointer const & channelPut, PVStructure::shared_pointer const & pvStructure, BitSet::shared_pointer const & bitSet)
{
{
Lock guard(_mutex);
@@ -845,7 +845,7 @@ void ServerChannelPutRequesterImpl::send(ByteBuffer* buffer, TransportSendContro
/****************************************************************************************/
void ServerPutGetHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer) {
AbstractServerResponseHandler::handleResponse(responseFrom,
transport, version, command, payloadSize, payloadBuffer);
@@ -912,21 +912,21 @@ void ServerPutGetHandler::handleResponse(osiSockAddr* responseFrom,
}
}
ServerChannelPutGetRequesterImpl::ServerChannelPutGetRequesterImpl(ServerContextImpl::shared_pointer& context, ServerChannelImpl::shared_pointer& channel,
const pvAccessID ioid, Transport::shared_pointer& transport):
ServerChannelPutGetRequesterImpl::ServerChannelPutGetRequesterImpl(ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel,
const pvAccessID ioid, Transport::shared_pointer const & transport):
BaseChannelRequester(context, channel, ioid, transport), _channelPutGet(), _pvPutStructure(), _pvGetStructure()
{
}
ChannelPutGetRequester::shared_pointer ServerChannelPutGetRequesterImpl::create(ServerContextImpl::shared_pointer& context, ServerChannelImpl::shared_pointer& channel,
const pvAccessID ioid, Transport::shared_pointer& transport,PVStructure::shared_pointer& pvRequest)
ChannelPutGetRequester::shared_pointer ServerChannelPutGetRequesterImpl::create(ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel,
const pvAccessID ioid, Transport::shared_pointer const & transport,PVStructure::shared_pointer const & pvRequest)
{
ChannelPutGetRequester::shared_pointer thisPointer(new ServerChannelPutGetRequesterImpl(context, channel, ioid, transport));
static_cast<ServerChannelPutGetRequesterImpl*>(thisPointer.get())->activate(pvRequest);
return thisPointer;
}
void ServerChannelPutGetRequesterImpl::activate(PVStructure::shared_pointer& pvRequest)
void ServerChannelPutGetRequesterImpl::activate(PVStructure::shared_pointer const & pvRequest)
{
startRequest(QOS_INIT);
ChannelPutGetRequester::shared_pointer thisPointer = shared_from_this();
@@ -935,8 +935,8 @@ void ServerChannelPutGetRequesterImpl::activate(PVStructure::shared_pointer& pvR
INIT_EXCEPTION_GUARD(CMD_PUT_GET, _channelPutGet = _channel->getChannel()->createChannelPutGet(thisPointer, pvRequest));
}
void ServerChannelPutGetRequesterImpl::channelPutGetConnect(const Status& status, ChannelPutGet::shared_pointer& channelPutGet,
PVStructure::shared_pointer& pvPutStructure, PVStructure::shared_pointer& pvGetStructure)
void ServerChannelPutGetRequesterImpl::channelPutGetConnect(const Status& status, ChannelPutGet::shared_pointer const & channelPutGet,
PVStructure::shared_pointer const & pvPutStructure, PVStructure::shared_pointer const & pvGetStructure)
{
{
Lock guard(_mutex);
@@ -1067,7 +1067,7 @@ void ServerChannelPutGetRequesterImpl::send(ByteBuffer* buffer, TransportSendCon
/****************************************************************************************/
void ServerMonitorHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer) {
AbstractServerResponseHandler::handleResponse(responseFrom,
transport, version, command, payloadSize, payloadBuffer);
@@ -1138,22 +1138,22 @@ void ServerMonitorHandler::handleResponse(osiSockAddr* responseFrom,
}
ServerMonitorRequesterImpl::ServerMonitorRequesterImpl(
ServerContextImpl::shared_pointer& context, ServerChannelImpl::shared_pointer& channel,
const pvAccessID ioid, Transport::shared_pointer& transport):
ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel,
const pvAccessID ioid, Transport::shared_pointer const & transport):
BaseChannelRequester(context, channel, ioid, transport), _monitor(), _channelMonitor(), _structure()
{
}
MonitorRequester::shared_pointer ServerMonitorRequesterImpl::create(
ServerContextImpl::shared_pointer& context, ServerChannelImpl::shared_pointer& channel,
const pvAccessID ioid, Transport::shared_pointer& transport,PVStructure::shared_pointer& pvRequest)
ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel,
const pvAccessID ioid, Transport::shared_pointer const & transport,PVStructure::shared_pointer const & pvRequest)
{
MonitorRequester::shared_pointer thisPointer(new ServerMonitorRequesterImpl(context, channel, ioid, transport));
static_cast<ServerMonitorRequesterImpl*>(thisPointer.get())->activate(pvRequest);
return thisPointer;
}
void ServerMonitorRequesterImpl::activate(PVStructure::shared_pointer& pvRequest)
void ServerMonitorRequesterImpl::activate(PVStructure::shared_pointer const & pvRequest)
{
startRequest(QOS_INIT);
MonitorRequester::shared_pointer thisPointer = shared_from_this();
@@ -1162,7 +1162,7 @@ void ServerMonitorRequesterImpl::activate(PVStructure::shared_pointer& pvRequest
INIT_EXCEPTION_GUARD(CMD_MONITOR, _channelMonitor = _channel->getChannel()->createMonitor(thisPointer, pvRequest));
}
void ServerMonitorRequesterImpl::monitorConnect(const Status& status, Monitor::shared_pointer& monitor, epics::pvData::StructureConstPtr& structure)
void ServerMonitorRequesterImpl::monitorConnect(const Status& status, Monitor::shared_pointer const & monitor, epics::pvData::StructureConstPtr const & structure)
{
{
Lock guard(_mutex);
@@ -1181,12 +1181,12 @@ void ServerMonitorRequesterImpl::monitorConnect(const Status& status, Monitor::s
}
}
void ServerMonitorRequesterImpl::unlisten(Monitor::shared_pointer& monitor)
void ServerMonitorRequesterImpl::unlisten(Monitor::shared_pointer const & monitor)
{
//TODO
}
void ServerMonitorRequesterImpl::monitorEvent(Monitor::shared_pointer& monitor)
void ServerMonitorRequesterImpl::monitorEvent(Monitor::shared_pointer const & monitor)
{
// TODO !!! if queueSize==0, monitor.poll() has to be called and returned NOW (since there is no cache)
//sendEvent(transport);
@@ -1283,7 +1283,7 @@ void ServerMonitorRequesterImpl::send(ByteBuffer* buffer, TransportSendControl*
/****************************************************************************************/
void ServerArrayHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer) {
AbstractServerResponseHandler::handleResponse(responseFrom,
transport, version, command, payloadSize, payloadBuffer);
@@ -1358,22 +1358,22 @@ void ServerArrayHandler::handleResponse(osiSockAddr* responseFrom,
}
ServerChannelArrayRequesterImpl::ServerChannelArrayRequesterImpl(
ServerContextImpl::shared_pointer& context, ServerChannelImpl::shared_pointer& channel,
const pvAccessID ioid, Transport::shared_pointer& transport):
ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel,
const pvAccessID ioid, Transport::shared_pointer const & transport):
BaseChannelRequester(context, channel, ioid, transport), _channelArray(), _pvArray()
{
}
ChannelArrayRequester::shared_pointer ServerChannelArrayRequesterImpl::create(
ServerContextImpl::shared_pointer& context, ServerChannelImpl::shared_pointer& channel,
const pvAccessID ioid, Transport::shared_pointer& transport,PVStructure::shared_pointer& pvRequest)
ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel,
const pvAccessID ioid, Transport::shared_pointer const & transport,PVStructure::shared_pointer const & pvRequest)
{
ChannelArrayRequester::shared_pointer thisPointer(new ServerChannelArrayRequesterImpl(context, channel, ioid, transport));
static_cast<ServerChannelArrayRequesterImpl*>(thisPointer.get())->activate(pvRequest);
return thisPointer;
}
void ServerChannelArrayRequesterImpl::activate(PVStructure::shared_pointer& pvRequest)
void ServerChannelArrayRequesterImpl::activate(PVStructure::shared_pointer const & pvRequest)
{
startRequest(QOS_INIT);
ChannelArrayRequester::shared_pointer thisPointer = shared_from_this();
@@ -1382,7 +1382,7 @@ void ServerChannelArrayRequesterImpl::activate(PVStructure::shared_pointer& pvRe
INIT_EXCEPTION_GUARD(CMD_ARRAY, _channelArray = _channel->getChannel()->createChannelArray(thisPointer, pvRequest));
}
void ServerChannelArrayRequesterImpl::channelArrayConnect(const Status& status, ChannelArray::shared_pointer& channelArray, PVArray::shared_pointer& pvArray)
void ServerChannelArrayRequesterImpl::channelArrayConnect(const Status& status, ChannelArray::shared_pointer const & channelArray, PVArray::shared_pointer const & pvArray)
{
{
Lock guard(_mutex);
@@ -1500,7 +1500,7 @@ void ServerChannelArrayRequesterImpl::send(ByteBuffer* buffer, TransportSendCont
/****************************************************************************************/
void ServerCancelRequestHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer) {
AbstractServerResponseHandler::handleResponse(responseFrom,
transport, version, command, payloadSize, payloadBuffer);
@@ -1533,14 +1533,14 @@ void ServerCancelRequestHandler::handleResponse(osiSockAddr* responseFrom,
channel->unregisterRequest(ioid);
}
void ServerCancelRequestHandler::failureResponse(Transport::shared_pointer& transport, pvAccessID ioid, const Status& errorStatus)
void ServerCancelRequestHandler::failureResponse(Transport::shared_pointer const & transport, pvAccessID ioid, const Status& errorStatus)
{
BaseChannelRequester::message(transport, ioid, errorStatus.getMessage(), warningMessage);
}
/****************************************************************************************/
void ServerProcessHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer) {
AbstractServerResponseHandler::handleResponse(responseFrom,
transport, version, command, payloadSize, payloadBuffer);
@@ -1593,22 +1593,22 @@ void ServerProcessHandler::handleResponse(osiSockAddr* responseFrom,
}
ServerChannelProcessRequesterImpl::ServerChannelProcessRequesterImpl(
ServerContextImpl::shared_pointer& context, ServerChannelImpl::shared_pointer& channel,
const pvAccessID ioid, Transport::shared_pointer& transport):
ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel,
const pvAccessID ioid, Transport::shared_pointer const & transport):
BaseChannelRequester(context, channel, ioid, transport), _channelProcess()
{
}
ChannelProcessRequester::shared_pointer ServerChannelProcessRequesterImpl::create(
ServerContextImpl::shared_pointer& context, ServerChannelImpl::shared_pointer& channel,
const pvAccessID ioid, Transport::shared_pointer& transport,PVStructure::shared_pointer& pvRequest)
ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel,
const pvAccessID ioid, Transport::shared_pointer const & transport,PVStructure::shared_pointer const & pvRequest)
{
ChannelProcessRequester::shared_pointer thisPointer(new ServerChannelProcessRequesterImpl(context, channel, ioid, transport));
static_cast<ServerChannelProcessRequesterImpl*>(thisPointer.get())->activate(pvRequest);
return thisPointer;
}
void ServerChannelProcessRequesterImpl::activate(PVStructure::shared_pointer& pvRequest)
void ServerChannelProcessRequesterImpl::activate(PVStructure::shared_pointer const & pvRequest)
{
startRequest(QOS_INIT);
ChannelProcessRequester::shared_pointer thisPointer = shared_from_this();
@@ -1617,7 +1617,7 @@ void ServerChannelProcessRequesterImpl::activate(PVStructure::shared_pointer& pv
INIT_EXCEPTION_GUARD(CMD_PROCESS, _channelProcess = _channel->getChannel()->createChannelProcess(thisPointer, pvRequest));
}
void ServerChannelProcessRequesterImpl::channelProcessConnect(const Status& status, ChannelProcess::shared_pointer& channelProcess)
void ServerChannelProcessRequesterImpl::channelProcessConnect(const Status& status, ChannelProcess::shared_pointer const & channelProcess)
{
{
Lock guard(_mutex);
@@ -1697,7 +1697,7 @@ void ServerChannelProcessRequesterImpl::send(ByteBuffer* buffer, TransportSendCo
/****************************************************************************************/
void ServerGetFieldHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer) {
AbstractServerResponseHandler::handleResponse(responseFrom,
transport, version, command, payloadSize, payloadBuffer);
@@ -1724,20 +1724,20 @@ void ServerGetFieldHandler::handleResponse(osiSockAddr* responseFrom,
channel->getChannel()->getField(gfr, subField);
}
void ServerGetFieldHandler::getFieldFailureResponse(Transport::shared_pointer& transport, const pvAccessID ioid, const Status& errorStatus)
void ServerGetFieldHandler::getFieldFailureResponse(Transport::shared_pointer const & transport, const pvAccessID ioid, const Status& errorStatus)
{
TransportSender::shared_pointer sender(new ServerGetFieldHandlerTransportSender(ioid,errorStatus,transport));
transport->enqueueSendRequest(sender);
}
ServerGetFieldRequesterImpl::ServerGetFieldRequesterImpl(
ServerContextImpl::shared_pointer& context, ServerChannelImpl::shared_pointer& channel,
const pvAccessID ioid, Transport::shared_pointer& transport) :
ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel,
const pvAccessID ioid, Transport::shared_pointer const & transport) :
BaseChannelRequester(context, channel, ioid, transport), _field()
{
}
void ServerGetFieldRequesterImpl::getDone(const Status& status, FieldConstPtr& field)
void ServerGetFieldRequesterImpl::getDone(const Status& status, FieldConstPtr const & field)
{
{
Lock guard(_mutex);
@@ -1776,7 +1776,7 @@ void ServerGetFieldRequesterImpl::send(ByteBuffer* buffer, TransportSendControl*
/****************************************************************************************/
void ServerRPCHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, ByteBuffer* payloadBuffer) {
AbstractServerResponseHandler::handleResponse(responseFrom,
transport, version, command, payloadSize, payloadBuffer);
@@ -1833,8 +1833,8 @@ void ServerRPCHandler::handleResponse(osiSockAddr* responseFrom,
}
ServerChannelRPCRequesterImpl::ServerChannelRPCRequesterImpl(
ServerContextImpl::shared_pointer& context, ServerChannelImpl::shared_pointer& channel,
const pvAccessID ioid, Transport::shared_pointer& transport):
ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel,
const pvAccessID ioid, Transport::shared_pointer const & transport):
BaseChannelRequester(context, channel, ioid, transport),
_channelRPC(), _pvArguments(), _pvResponse(), _argumentsBitSet()
@@ -1842,15 +1842,15 @@ ServerChannelRPCRequesterImpl::ServerChannelRPCRequesterImpl(
}
ChannelRPCRequester::shared_pointer ServerChannelRPCRequesterImpl::create(
ServerContextImpl::shared_pointer& context, ServerChannelImpl::shared_pointer& channel,
const pvAccessID ioid, Transport::shared_pointer& transport, PVStructure::shared_pointer& pvRequest)
ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel,
const pvAccessID ioid, Transport::shared_pointer const & transport, PVStructure::shared_pointer const & pvRequest)
{
ChannelRPCRequester::shared_pointer thisPointer(new ServerChannelRPCRequesterImpl(context, channel, ioid, transport));
static_cast<ServerChannelRPCRequesterImpl*>(thisPointer.get())->activate(pvRequest);
return thisPointer;
}
void ServerChannelRPCRequesterImpl::activate(PVStructure::shared_pointer& pvRequest)
void ServerChannelRPCRequesterImpl::activate(PVStructure::shared_pointer const & pvRequest)
{
startRequest(QOS_INIT);
ChannelRPCRequester::shared_pointer thisPointer = shared_from_this();
@@ -1859,7 +1859,7 @@ void ServerChannelRPCRequesterImpl::activate(PVStructure::shared_pointer& pvRequ
INIT_EXCEPTION_GUARD(CMD_RPC, _channelRPC = _channel->getChannel()->createChannelRPC(thisPointer, pvRequest));
}
void ServerChannelRPCRequesterImpl::channelRPCConnect(const Status& status, ChannelRPC::shared_pointer& channelRPC, PVStructure::shared_pointer& arguments, BitSet::shared_pointer& bitSet)
void ServerChannelRPCRequesterImpl::channelRPCConnect(const Status& status, ChannelRPC::shared_pointer const & channelRPC, PVStructure::shared_pointer const & arguments, BitSet::shared_pointer const & bitSet)
{
{
Lock guard(_mutex);
@@ -1878,7 +1878,7 @@ void ServerChannelRPCRequesterImpl::channelRPCConnect(const Status& status, Chan
}
}
void ServerChannelRPCRequesterImpl::requestDone(const Status& status, PVStructure::shared_pointer& pvResponse)
void ServerChannelRPCRequesterImpl::requestDone(const Status& status, PVStructure::shared_pointer const & pvResponse)
{
{
Lock guard(_mutex);

222
pvAccessApp/server/responseHandlers.h
View File

@@ -19,7 +19,7 @@ namespace epics {
protected:
ServerContextImpl::shared_pointer _context;
public:
AbstractServerResponseHandler(ServerContextImpl::shared_pointer& context, String description) :
AbstractServerResponseHandler(ServerContextImpl::shared_pointer const & context, String description) :
AbstractResponseHandler(context.get(), description), _context(context) {
}
@@ -32,7 +32,7 @@ namespace epics {
*/
class ServerBadResponse : public AbstractServerResponseHandler {
public:
ServerBadResponse(ServerContextImpl::shared_pointer& context) :
ServerBadResponse(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "Bad request") {
}
@@ -40,7 +40,7 @@ namespace epics {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
};
@@ -49,13 +49,13 @@ namespace epics {
*/
class ServerResponseHandler : public ResponseHandler {
public:
ServerResponseHandler(ServerContextImpl::shared_pointer& context);
ServerResponseHandler(ServerContextImpl::shared_pointer const & context);
virtual ~ServerResponseHandler() {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
private:
/**
@@ -70,12 +70,12 @@ namespace epics {
*/
class ServerConnectionValidationHandler : public AbstractServerResponseHandler {
public:
ServerConnectionValidationHandler(ServerContextImpl::shared_pointer& context) :
ServerConnectionValidationHandler(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "Connection validation") {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
};
@@ -84,7 +84,7 @@ namespace epics {
*/
class ServerNoopResponse : public AbstractServerResponseHandler {
public:
ServerNoopResponse(ServerContextImpl::shared_pointer& context, String description) :
ServerNoopResponse(ServerContextImpl::shared_pointer const & context, String description) :
AbstractServerResponseHandler(context, description) {
}
};
@@ -94,12 +94,12 @@ namespace epics {
*/
class ServerEchoHandler : public AbstractServerResponseHandler {
public:
ServerEchoHandler(ServerContextImpl::shared_pointer& context) :
ServerEchoHandler(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "Echo request") {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
};
@@ -134,12 +134,12 @@ namespace epics {
class ServerIntrospectionSearchHandler : public AbstractServerResponseHandler
{
public:
ServerIntrospectionSearchHandler(ServerContextImpl::shared_pointer& context) :
ServerIntrospectionSearchHandler(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "Search request") {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
};
@@ -151,11 +151,11 @@ namespace epics {
class ServerSearchHandler : public AbstractServerResponseHandler
{
public:
ServerSearchHandler(ServerContextImpl::shared_pointer& context);
ServerSearchHandler(ServerContextImpl::shared_pointer const & context);
virtual ~ServerSearchHandler();
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
private:
@@ -169,10 +169,10 @@ namespace epics {
public std::tr1::enable_shared_from_this<ServerChannelFindRequesterImpl>
{
public:
ServerChannelFindRequesterImpl(ServerContextImpl::shared_pointer& context);
ServerChannelFindRequesterImpl(ServerContextImpl::shared_pointer const & context);
void clear();
ServerChannelFindRequesterImpl* set(int32 searchSequenceId, int32 cid, osiSockAddr* sendTo, boolean responseRequired);
void channelFindResult(const epics::pvData::Status& status, ChannelFind::shared_pointer& channelFind, boolean wasFound);
void channelFindResult(const epics::pvData::Status& status, ChannelFind::shared_pointer const & channelFind, boolean wasFound);
void lock();
void unlock();
void send(epics::pvData::ByteBuffer* buffer, TransportSendControl* control);
@@ -193,17 +193,17 @@ namespace epics {
class ServerCreateChannelHandler : public AbstractServerResponseHandler
{
public:
ServerCreateChannelHandler(ServerContextImpl::shared_pointer& context) :
ServerCreateChannelHandler(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "Create channel request") {
_provider = context->getChannelProvider();
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
private:
void disconnect(Transport::shared_pointer& transport);
void disconnect(Transport::shared_pointer const & transport);
ChannelProvider::shared_pointer _provider;
};
@@ -216,11 +216,11 @@ namespace epics {
typedef std::tr1::shared_ptr<ServerChannelRequesterImpl> shared_pointer;
typedef std::tr1::shared_ptr<const ServerChannelRequesterImpl> const_shared_pointer;
protected:
ServerChannelRequesterImpl(Transport::shared_pointer& transport, const String channelName, const pvAccessID cid);
ServerChannelRequesterImpl(Transport::shared_pointer const & transport, const String channelName, const pvAccessID cid);
public:
static ChannelRequester::shared_pointer create(ChannelProvider::shared_pointer& provider, Transport::shared_pointer& transport, const String channelName, const pvAccessID cid);
void channelCreated(const epics::pvData::Status& status, Channel::shared_pointer& channel);
void channelStateChange(Channel::shared_pointer& c, const Channel::ConnectionState isConnected);
static ChannelRequester::shared_pointer create(ChannelProvider::shared_pointer const & provider, Transport::shared_pointer const & transport, const String channelName, const pvAccessID cid);
void channelCreated(const epics::pvData::Status& status, Channel::shared_pointer const & channel);
void channelStateChange(Channel::shared_pointer const & c, const Channel::ConnectionState isConnected);
String getRequesterName();
void message(const String message, const epics::pvData::MessageType messageType);
void lock();
@@ -243,12 +243,12 @@ namespace epics {
class ServerDestroyChannelHandler : public AbstractServerResponseHandler
{
public:
ServerDestroyChannelHandler(ServerContextImpl::shared_pointer& context) :
ServerDestroyChannelHandler(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "Destroy channel request") {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
};
@@ -285,12 +285,12 @@ namespace epics {
class ServerGetHandler : public AbstractServerResponseHandler
{
public:
ServerGetHandler(ServerContextImpl::shared_pointer& context) :
ServerGetHandler(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "Get request") {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
};
@@ -304,17 +304,17 @@ namespace epics {
typedef std::tr1::shared_ptr<ServerChannelGetRequesterImpl> shared_pointer;
typedef std::tr1::shared_ptr<const ServerChannelGetRequesterImpl> const_shared_pointer;
protected:
ServerChannelGetRequesterImpl(ServerContextImpl::shared_pointer& context,
ServerChannelImpl::shared_pointer& channel, const pvAccessID ioid,
Transport::shared_pointer& transport);
void activate(epics::pvData::PVStructure::shared_pointer& pvRequest);
ServerChannelGetRequesterImpl(ServerContextImpl::shared_pointer const & context,
ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid,
Transport::shared_pointer const & transport);
void activate(epics::pvData::PVStructure::shared_pointer const & pvRequest);
public:
static ChannelGetRequester::shared_pointer create(ServerContextImpl::shared_pointer& context,
ServerChannelImpl::shared_pointer& channel, const pvAccessID ioid,
Transport::shared_pointer& transport,
epics::pvData::PVStructure::shared_pointer& pvRequest);
void channelGetConnect(const epics::pvData::Status& status, ChannelGet::shared_pointer& channelGet,
epics::pvData::PVStructure::shared_pointer& pvStructure, epics::pvData::BitSet::shared_pointer& bitSet);
static ChannelGetRequester::shared_pointer create(ServerContextImpl::shared_pointer const & context,
ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid,
Transport::shared_pointer const & transport,
epics::pvData::PVStructure::shared_pointer const & pvRequest);
void channelGetConnect(const epics::pvData::Status& status, ChannelGet::shared_pointer const & channelGet,
epics::pvData::PVStructure::shared_pointer const & pvStructure, epics::pvData::BitSet::shared_pointer const & bitSet);
void getDone(const epics::pvData::Status& status);
void destroy();
@@ -343,7 +343,7 @@ namespace epics {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
};
@@ -357,16 +357,16 @@ namespace epics {
typedef std::tr1::shared_ptr<ServerChannelPutRequesterImpl> shared_pointer;
typedef std::tr1::shared_ptr<const ServerChannelPutRequesterImpl> const_shared_pointer;
protected:
ServerChannelPutRequesterImpl(ServerContextImpl::shared_pointer& context,
ServerChannelImpl::shared_pointer& channel, const pvAccessID ioid,
Transport::shared_pointer& transport);
void activate(epics::pvData::PVStructure::shared_pointer& pvRequest);
ServerChannelPutRequesterImpl(ServerContextImpl::shared_pointer const & context,
ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid,
Transport::shared_pointer const & transport);
void activate(epics::pvData::PVStructure::shared_pointer const & pvRequest);
public:
static ChannelPutRequester::shared_pointer create(ServerContextImpl::shared_pointer& context,
ServerChannelImpl::shared_pointer& channel, const pvAccessID ioid,
Transport::shared_pointer& transport,epics::pvData::PVStructure::shared_pointer& pvRequest);
static ChannelPutRequester::shared_pointer create(ServerContextImpl::shared_pointer const & context,
ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid,
Transport::shared_pointer const & transport,epics::pvData::PVStructure::shared_pointer const & pvRequest);
void channelPutConnect(const epics::pvData::Status& status, ChannelPut::shared_pointer& channelPut, epics::pvData::PVStructure::shared_pointer& pvStructure, epics::pvData::BitSet::shared_pointer& bitSet);
void channelPutConnect(const epics::pvData::Status& status, ChannelPut::shared_pointer const & channelPut, epics::pvData::PVStructure::shared_pointer const & pvStructure, epics::pvData::BitSet::shared_pointer const & bitSet);
void putDone(const epics::pvData::Status& status);
void getDone(const epics::pvData::Status& status);
void lock();
@@ -391,12 +391,12 @@ namespace epics {
class ServerPutGetHandler : public AbstractServerResponseHandler
{
public:
ServerPutGetHandler(ServerContextImpl::shared_pointer& context) :
ServerPutGetHandler(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "Put-get request") {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
};
@@ -410,16 +410,16 @@ namespace epics {
typedef std::tr1::shared_ptr<ServerChannelPutGetRequesterImpl> shared_pointer;
typedef std::tr1::shared_ptr<const ServerChannelPutGetRequesterImpl> const_shared_pointer;
protected:
ServerChannelPutGetRequesterImpl(ServerContextImpl::shared_pointer& context,
ServerChannelImpl::shared_pointer& channel, const pvAccessID ioid,
Transport::shared_pointer& transport);
void activate(epics::pvData::PVStructure::shared_pointer& pvRequest);
ServerChannelPutGetRequesterImpl(ServerContextImpl::shared_pointer const & context,
ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid,
Transport::shared_pointer const & transport);
void activate(epics::pvData::PVStructure::shared_pointer const & pvRequest);
public:
static ChannelPutGetRequester::shared_pointer create(ServerContextImpl::shared_pointer& context,
ServerChannelImpl::shared_pointer& channel, const pvAccessID ioid,
Transport::shared_pointer& transport,epics::pvData::PVStructure::shared_pointer& pvRequest);
static ChannelPutGetRequester::shared_pointer create(ServerContextImpl::shared_pointer const & context,
ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid,
Transport::shared_pointer const & transport,epics::pvData::PVStructure::shared_pointer const & pvRequest);
void channelPutGetConnect(const epics::pvData::Status& status, ChannelPutGet::shared_pointer& channelPutGet, epics::pvData::PVStructure::shared_pointer& pvPutStructure, epics::pvData::PVStructure::shared_pointer& pvGetStructure);
void channelPutGetConnect(const epics::pvData::Status& status, ChannelPutGet::shared_pointer const & channelPutGet, epics::pvData::PVStructure::shared_pointer const & pvPutStructure, epics::pvData::PVStructure::shared_pointer const & pvGetStructure);
void getGetDone(const epics::pvData::Status& status);
void getPutDone(const epics::pvData::Status& status);
void putGetDone(const epics::pvData::Status& status);
@@ -445,12 +445,12 @@ namespace epics {
class ServerMonitorHandler : public AbstractServerResponseHandler
{
public:
ServerMonitorHandler(ServerContextImpl::shared_pointer& context) :
ServerMonitorHandler(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "Monitor request") {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
};
@@ -465,18 +465,18 @@ namespace epics {
typedef std::tr1::shared_ptr<ServerMonitorRequesterImpl> shared_pointer;
typedef std::tr1::shared_ptr<const ServerMonitorRequesterImpl> const_shared_pointer;
protected:
ServerMonitorRequesterImpl(ServerContextImpl::shared_pointer& context,
ServerChannelImpl::shared_pointer& channel, const pvAccessID ioid,
Transport::shared_pointer& transport);
void activate(epics::pvData::PVStructure::shared_pointer& pvRequest);
ServerMonitorRequesterImpl(ServerContextImpl::shared_pointer const & context,
ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid,
Transport::shared_pointer const & transport);
void activate(epics::pvData::PVStructure::shared_pointer const & pvRequest);
public:
static MonitorRequester::shared_pointer create(ServerContextImpl::shared_pointer& context,
ServerChannelImpl::shared_pointer& channel, const pvAccessID ioid,
Transport::shared_pointer& transport,epics::pvData::PVStructure::shared_pointer& pvRequest);
static MonitorRequester::shared_pointer create(ServerContextImpl::shared_pointer const & context,
ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid,
Transport::shared_pointer const & transport,epics::pvData::PVStructure::shared_pointer const & pvRequest);
void monitorConnect(const epics::pvData::Status& status, epics::pvData::Monitor::shared_pointer& monitor, epics::pvData::StructureConstPtr& structure);
void unlisten(epics::pvData::Monitor::shared_pointer& monitor);
void monitorEvent(epics::pvData::Monitor::shared_pointer& monitor);
void monitorConnect(const epics::pvData::Status& status, epics::pvData::Monitor::shared_pointer const & monitor, epics::pvData::StructureConstPtr const & structure);
void unlisten(epics::pvData::Monitor::shared_pointer const & monitor);
void monitorEvent(epics::pvData::Monitor::shared_pointer const & monitor);
void lock();
void unlock();
void destroy();
@@ -498,12 +498,12 @@ namespace epics {
class ServerArrayHandler : public AbstractServerResponseHandler
{
public:
ServerArrayHandler(ServerContextImpl::shared_pointer& context) :
ServerArrayHandler(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "Array request") {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
};
@@ -517,16 +517,16 @@ namespace epics {
typedef std::tr1::shared_ptr<ServerChannelArrayRequesterImpl> shared_pointer;
typedef std::tr1::shared_ptr<const ServerChannelArrayRequesterImpl> const_shared_pointer;
protected:
ServerChannelArrayRequesterImpl(ServerContextImpl::shared_pointer& context,
ServerChannelImpl::shared_pointer& channel, const pvAccessID ioid,
Transport::shared_pointer& transport);
void activate(epics::pvData::PVStructure::shared_pointer& pvRequest);
ServerChannelArrayRequesterImpl(ServerContextImpl::shared_pointer const & context,
ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid,
Transport::shared_pointer const & transport);
void activate(epics::pvData::PVStructure::shared_pointer const & pvRequest);
public:
static ChannelArrayRequester::shared_pointer create(ServerContextImpl::shared_pointer& context,
ServerChannelImpl::shared_pointer& channel, const pvAccessID ioid,
Transport::shared_pointer& transport,epics::pvData::PVStructure::shared_pointer& pvRequest);
static ChannelArrayRequester::shared_pointer create(ServerContextImpl::shared_pointer const & context,
ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid,
Transport::shared_pointer const & transport,epics::pvData::PVStructure::shared_pointer const & pvRequest);
void channelArrayConnect(const epics::pvData::Status& status, ChannelArray::shared_pointer& channelArray, epics::pvData::PVArray::shared_pointer& pvArray);
void channelArrayConnect(const epics::pvData::Status& status, ChannelArray::shared_pointer const & channelArray, epics::pvData::PVArray::shared_pointer const & pvArray);
void getArrayDone(const epics::pvData::Status& status);
void putArrayDone(const epics::pvData::Status& status);
void setLengthDone(const epics::pvData::Status& status);
@@ -552,16 +552,16 @@ namespace epics {
class ServerCancelRequestHandler : public AbstractServerResponseHandler
{
public:
ServerCancelRequestHandler(ServerContextImpl::shared_pointer& context) :
ServerCancelRequestHandler(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "Cancel request") {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
private:
void failureResponse(Transport::shared_pointer& transport, pvAccessID ioid, const epics::pvData::Status& errorStatus);
void failureResponse(Transport::shared_pointer const & transport, pvAccessID ioid, const epics::pvData::Status& errorStatus);
};
@@ -572,12 +572,12 @@ namespace epics {
class ServerProcessHandler : public AbstractServerResponseHandler
{
public:
ServerProcessHandler(ServerContextImpl::shared_pointer& context) :
ServerProcessHandler(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "Process request") {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
};
@@ -591,16 +591,16 @@ namespace epics {
typedef std::tr1::shared_ptr<ServerChannelProcessRequesterImpl> shared_pointer;
typedef std::tr1::shared_ptr<const ServerChannelProcessRequesterImpl> const_shared_pointer;
protected:
ServerChannelProcessRequesterImpl(ServerContextImpl::shared_pointer& context,
ServerChannelImpl::shared_pointer& channel, const pvAccessID ioid,
Transport::shared_pointer& transport);
void activate(epics::pvData::PVStructure::shared_pointer& pvRequest);
ServerChannelProcessRequesterImpl(ServerContextImpl::shared_pointer const & context,
ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid,
Transport::shared_pointer const & transport);
void activate(epics::pvData::PVStructure::shared_pointer const & pvRequest);
public:
static ChannelProcessRequester::shared_pointer create(ServerContextImpl::shared_pointer& context,
ServerChannelImpl::shared_pointer& channel, const pvAccessID ioid,
Transport::shared_pointer& transport, epics::pvData::PVStructure::shared_pointer& pvRequest);
static ChannelProcessRequester::shared_pointer create(ServerContextImpl::shared_pointer const & context,
ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid,
Transport::shared_pointer const & transport, epics::pvData::PVStructure::shared_pointer const & pvRequest);
void channelProcessConnect(const epics::pvData::Status& status, ChannelProcess::shared_pointer& channelProcess);
void channelProcessConnect(const epics::pvData::Status& status, ChannelProcess::shared_pointer const & channelProcess);
void processDone(const epics::pvData::Status& status);
void lock();
void unlock();
@@ -621,15 +621,15 @@ namespace epics {
class ServerGetFieldHandler : public AbstractServerResponseHandler
{
public:
ServerGetFieldHandler(ServerContextImpl::shared_pointer& context) :
ServerGetFieldHandler(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "Get field request") {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
private:
void getFieldFailureResponse(Transport::shared_pointer& transport, const pvAccessID ioid, const epics::pvData::Status& errorStatus);
void getFieldFailureResponse(Transport::shared_pointer const & transport, const pvAccessID ioid, const epics::pvData::Status& errorStatus);
};
class ServerGetFieldRequesterImpl :
@@ -642,11 +642,11 @@ namespace epics {
typedef std::tr1::shared_ptr<ServerGetFieldRequesterImpl> shared_pointer;
typedef std::tr1::shared_ptr<const ServerGetFieldRequesterImpl> const_shared_pointer;
ServerGetFieldRequesterImpl(ServerContextImpl::shared_pointer& context,
ServerChannelImpl::shared_pointer& channel, const pvAccessID ioid,
Transport::shared_pointer& transport);
ServerGetFieldRequesterImpl(ServerContextImpl::shared_pointer const & context,
ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid,
Transport::shared_pointer const & transport);
void getDone(const epics::pvData::Status& status, epics::pvData::FieldConstPtr& field);
void getDone(const epics::pvData::Status& status, epics::pvData::FieldConstPtr const & field);
void lock();
void unlock();
void destroy();
@@ -659,7 +659,7 @@ namespace epics {
class ServerGetFieldHandlerTransportSender : public TransportSender
{
public:
ServerGetFieldHandlerTransportSender(const pvAccessID ioid,const epics::pvData::Status& status, Transport::shared_pointer& transport):
ServerGetFieldHandlerTransportSender(const pvAccessID ioid,const epics::pvData::Status& status, Transport::shared_pointer const & transport):
_ioid(ioid), _status(status), _transport(transport) {
}
@@ -681,7 +681,7 @@ namespace epics {
private:
const pvAccessID _ioid;
const epics::pvData::Status _status;
Transport::shared_pointer& _transport;
Transport::shared_pointer const & _transport;
};
@@ -693,12 +693,12 @@ namespace epics {
class ServerRPCHandler : public AbstractServerResponseHandler
{
public:
ServerRPCHandler(ServerContextImpl::shared_pointer& context) :
ServerRPCHandler(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "RPC request") {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command,
Transport::shared_pointer const & transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
};
@@ -712,17 +712,17 @@ namespace epics {
typedef std::tr1::shared_ptr<ServerChannelRPCRequesterImpl> shared_pointer;
typedef std::tr1::shared_ptr<const ServerChannelRPCRequesterImpl> const_shared_pointer;
protected:
ServerChannelRPCRequesterImpl(ServerContextImpl::shared_pointer& context,
ServerChannelImpl::shared_pointer& channel, const pvAccessID ioid,
Transport::shared_pointer& transport);
void activate(epics::pvData::PVStructure::shared_pointer& pvRequest);
ServerChannelRPCRequesterImpl(ServerContextImpl::shared_pointer const & context,
ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid,
Transport::shared_pointer const & transport);
void activate(epics::pvData::PVStructure::shared_pointer const & pvRequest);
public:
static ChannelRPCRequester::shared_pointer create(ServerContextImpl::shared_pointer& context,
ServerChannelImpl::shared_pointer& channel, const pvAccessID ioid,
Transport::shared_pointer& transport,epics::pvData::PVStructure::shared_pointer& pvRequest);
static ChannelRPCRequester::shared_pointer create(ServerContextImpl::shared_pointer const & context,
ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid,
Transport::shared_pointer const & transport,epics::pvData::PVStructure::shared_pointer const & pvRequest);
void channelRPCConnect(const epics::pvData::Status& status, ChannelRPC::shared_pointer& channelRPC, epics::pvData::PVStructure::shared_pointer& arguments, epics::pvData::BitSet::shared_pointer& bitSet);
void requestDone(const epics::pvData::Status& status, epics::pvData::PVStructure::shared_pointer& pvResponse);
void channelRPCConnect(const epics::pvData::Status& status, ChannelRPC::shared_pointer const & channelRPC, epics::pvData::PVStructure::shared_pointer const & arguments, epics::pvData::BitSet::shared_pointer const & bitSet);
void requestDone(const epics::pvData::Status& status, epics::pvData::PVStructure::shared_pointer const & pvResponse);
void lock();
void unlock();
void destroy();

4
pvAccessApp/server/serverChannelImpl.cpp
View File

@@ -8,7 +8,7 @@ using namespace epics::pvData;
namespace epics { namespace pvAccess {
ServerChannelImpl::ServerChannelImpl(Channel::shared_pointer& channel, pvAccessID cid, pvAccessID sid, epics::pvData::PVField::shared_pointer& securityToken):
ServerChannelImpl::ServerChannelImpl(Channel::shared_pointer const & channel, pvAccessID cid, pvAccessID sid, epics::pvData::PVField::shared_pointer const & securityToken):
_channel(channel),
_cid(cid),
_sid(cid),
@@ -41,7 +41,7 @@ int16 ServerChannelImpl::getAccessRights()
return 0;
}
void ServerChannelImpl::registerRequest(const pvAccessID id, Destroyable::shared_pointer& request)
void ServerChannelImpl::registerRequest(const pvAccessID id, Destroyable::shared_pointer const & request)
{
Lock guard(_mutex);
_requests[id] = request;

4
pvAccessApp/server/serverChannelImpl.h
View File

@@ -25,7 +25,7 @@ public:
* @param sid channel SID.
* @param securityToken security token.
*/
ServerChannelImpl(Channel::shared_pointer& channel, pvAccessID cid, pvAccessID sid, epics::pvData::PVField::shared_pointer& securityToken);
ServerChannelImpl(Channel::shared_pointer const & channel, pvAccessID cid, pvAccessID sid, epics::pvData::PVField::shared_pointer const & securityToken);
/*
* Destructor.
*/
@@ -61,7 +61,7 @@ public:
* @param id request ID.
* @param request request to be registered.
*/
void registerRequest(pvAccessID id, epics::pvData::Destroyable::shared_pointer& request);
void registerRequest(pvAccessID id, epics::pvData::Destroyable::shared_pointer const & request);
/**
* Unregister request.

4
pvAccessApp/server/serverContext.cpp
View File

@@ -114,7 +114,7 @@ void ServerContextImpl::loadConfiguration()
_channelProviderName = config->getPropertyAsString("EPICS4_CAS_PROVIDER_NAME", _channelProviderName);
}
void ServerContextImpl::initialize(ChannelAccess::shared_pointer& channelAccess)
void ServerContextImpl::initialize(ChannelAccess::shared_pointer const & channelAccess)
{
Lock guard(_mutex);
if (channelAccess == NULL)
@@ -419,7 +419,7 @@ void ServerContextImpl::dispose()
}
}
void ServerContextImpl::setBeaconServerStatusProvider(BeaconServerStatusProvider::shared_pointer& beaconServerStatusProvider)
void ServerContextImpl::setBeaconServerStatusProvider(BeaconServerStatusProvider::shared_pointer const & beaconServerStatusProvider)
{
_beaconServerStatusProvider = beaconServerStatusProvider;
}

8
pvAccessApp/server/serverContext.h
View File

@@ -43,7 +43,7 @@ public:
* Set <code>ChannelAccess</code> implementation and initialize server.
* @param channelAccess implementation of channel access to be served.
*/
virtual void initialize(ChannelAccess::shared_pointer& channelAccess) = 0;
virtual void initialize(ChannelAccess::shared_pointer const & channelAccess) = 0;
/**
* Run server (process events).
@@ -91,7 +91,7 @@ public:
* Set beacon server status provider.
* @param beaconServerStatusProvider <code>BeaconServerStatusProvider</code> implementation to set.
*/
virtual void setBeaconServerStatusProvider(BeaconServerStatusProvider::shared_pointer& beaconServerStatusProvider) = 0;
virtual void setBeaconServerStatusProvider(BeaconServerStatusProvider::shared_pointer const & beaconServerStatusProvider) = 0;
};
@@ -114,14 +114,14 @@ public:
//**************** derived from ServerContext ****************//
const Version& getVersion();
void initialize(ChannelAccess::shared_pointer& channelAccess);
void initialize(ChannelAccess::shared_pointer const & channelAccess);
void run(int32 seconds);
void shutdown();
void destroy();
void printInfo();
void printInfo(ostream& str);
void dispose();
void setBeaconServerStatusProvider(BeaconServerStatusProvider::shared_pointer& beaconServerStatusProvider);
void setBeaconServerStatusProvider(BeaconServerStatusProvider::shared_pointer const & beaconServerStatusProvider);
//**************** derived from Context ****************//
Timer::shared_pointer getTimer();
Channel::shared_pointer getChannel(pvAccessID id);

4
pvAccessApp/utils/transportRegistry.cpp
View File

@@ -18,7 +18,7 @@ TransportRegistry::~TransportRegistry()
{
}
void TransportRegistry::put(Transport::shared_pointer& transport)
void TransportRegistry::put(Transport::shared_pointer const & transport)
{
Lock guard(_mutex);
//const String type = transport.getType();
@@ -81,7 +81,7 @@ auto_ptr<TransportRegistry::transportVector_t> TransportRegistry::get(String typ
return auto_ptr<transportVector_t>();
}
Transport::shared_pointer TransportRegistry::remove(Transport::shared_pointer& transport)
Transport::shared_pointer TransportRegistry::remove(Transport::shared_pointer const & transport)
{
Lock guard(_mutex);
const int16 priority = transport->getPriority();

4
pvAccessApp/utils/transportRegistry.h
View File

@@ -30,10 +30,10 @@ public:
TransportRegistry();
virtual ~TransportRegistry();
void put(Transport::shared_pointer& transport);
void put(Transport::shared_pointer const & transport);
Transport::shared_pointer get(epics::pvData::String type, const osiSockAddr* address, const epics::pvData::int16 priority);
std::auto_ptr<transportVector_t> get(epics::pvData::String type, const osiSockAddr* address);
Transport::shared_pointer remove(Transport::shared_pointer& transport);
Transport::shared_pointer remove(Transport::shared_pointer const & transport);
void clear();
epics::pvData::int32 numberOfActiveTransports();
std::auto_ptr<transportVector_t> toArray(epics::pvData::String type);

4
testApp/remote/testBlockingTCPClnt.cpp
View File

@@ -72,7 +72,7 @@ public:
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command, int payloadSize,
Transport::shared_pointer const & transport, int8 version, int8 command, int payloadSize,
ByteBuffer* payloadBuffer) {
if(command==CMD_CONNECTION_VALIDATION) transport->verified();
@@ -88,7 +88,7 @@ public:
virtual void transportUnresponsive() {
errlogSevPrintf(errlogInfo, "unresponsive");
}
virtual void transportResponsive(Transport::shared_pointer& transport) {
virtual void transportResponsive(Transport::shared_pointer const & transport) {
errlogSevPrintf(errlogInfo, "responsive");
}
virtual void transportChanged() {

2
testApp/remote/testBlockingTCPSrv.cpp
View File

@@ -42,7 +42,7 @@ private:
class DummyResponseHandler : public ResponseHandler {
public:
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer& transport, int8 version, int8 command, int payloadSize,
Transport::shared_pointer const & transport, int8 version, int8 command, int payloadSize,
ByteBuffer* payloadBuffer) {
cout << "DummyResponseHandler::handleResponse" << endl;
}

2
testApp/remote/testBlockingUDPClnt.cpp
View File

@@ -63,7 +63,7 @@ public:
virtual ~DummyResponseHandler() {}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer&, int8 version, int8 command, int payloadSize,
Transport::shared_pointer const &, int8 version, int8 command, int payloadSize,
ByteBuffer* payloadBuffer) {
}
};

4
testApp/remote/testBlockingUDPSrv.cpp
View File

@@ -61,14 +61,14 @@ public:
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer&, int8 version, int8 command, int payloadSize,
Transport::shared_pointer const &, int8 version, int8 command, int payloadSize,
ByteBuffer* payloadBuffer);
private:
int packets;
};
void DummyResponseHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer&, int8 version, int8 command, int payloadSize,
Transport::shared_pointer const &, int8 version, int8 command, int payloadSize,
ByteBuffer* payloadBuffer) {
std::ostringstream os;

40
testApp/remote/testRemoteClientImpl.cpp
View File

@@ -16,7 +16,7 @@ using namespace epics::pvAccess;
class ChannelFindRequesterImpl : public ChannelFindRequester
{
virtual void channelFindResult(const epics::pvData::Status& status,ChannelFind::shared_pointer& channelFind,bool wasFound)
virtual void channelFindResult(const epics::pvData::Status& status,ChannelFind::shared_pointer const & channelFind,bool wasFound)
{
std::cout << "[ChannelFindRequesterImpl] channelFindResult("
<< status.toString() << ", ..., " << wasFound << ")" << std::endl;
@@ -35,13 +35,13 @@ class ChannelRequesterImpl : public ChannelRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
}
virtual void channelCreated(const epics::pvData::Status& status, Channel::shared_pointer& channel)
virtual void channelCreated(const epics::pvData::Status& status, Channel::shared_pointer const & channel)
{
std::cout << "channelCreated(" << status.toString() << ", "
<< (channel ? channel->getChannelName() : "(0)") << ")" << std::endl;
}
virtual void channelStateChange(Channel::shared_pointer& c, Channel::ConnectionState connectionState)
virtual void channelStateChange(Channel::shared_pointer const & c, Channel::ConnectionState connectionState)
{
std::cout << "channelStateChange(" << c->getChannelName() << ", " << Channel::ConnectionStateNames[connectionState] << ")" << std::endl;
}
@@ -59,7 +59,7 @@ class GetFieldRequesterImpl : public GetFieldRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
}
virtual void getDone(const epics::pvData::Status& status,epics::pvData::FieldConstPtr& field)
virtual void getDone(const epics::pvData::Status& status,epics::pvData::FieldConstPtr const & field)
{
std::cout << "getDone(" << status.toString() << ", ";
if (status.isSuccess() && field)
@@ -94,8 +94,8 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
}
virtual void channelGetConnect(const epics::pvData::Status& status,ChannelGet::shared_pointer& channelGet,
epics::pvData::PVStructure::shared_pointer& pvStructure,epics::pvData::BitSet::shared_pointer& bitSet)
virtual void channelGetConnect(const epics::pvData::Status& status,ChannelGet::shared_pointer const & channelGet,
epics::pvData::PVStructure::shared_pointer const & pvStructure,epics::pvData::BitSet::shared_pointer const & bitSet)
{
std::cout << "channelGetConnect(" << status.toString() << ")" << std::endl;
if (status.isSuccess())
@@ -144,8 +144,8 @@ class ChannelPutRequesterImpl : public ChannelPutRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
}
virtual void channelPutConnect(const epics::pvData::Status& status,ChannelPut::shared_pointer& channelPut,
epics::pvData::PVStructure::shared_pointer& pvStructure,epics::pvData::BitSet::shared_pointer& bitSet)
virtual void channelPutConnect(const epics::pvData::Status& status,ChannelPut::shared_pointer const & channelPut,
epics::pvData::PVStructure::shared_pointer const & pvStructure,epics::pvData::BitSet::shared_pointer const & bitSet)
{
std::cout << "channelPutConnect(" << status.toString() << ")" << std::endl;
@@ -200,8 +200,8 @@ class ChannelPutGetRequesterImpl : public ChannelPutGetRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
}
virtual void channelPutGetConnect(const epics::pvData::Status& status, ChannelPutGet::shared_pointer& channelPutGet,
epics::pvData::PVStructure::shared_pointer& putData,epics::pvData::PVStructure::shared_pointer& getData)
virtual void channelPutGetConnect(const epics::pvData::Status& status, ChannelPutGet::shared_pointer const & channelPutGet,
epics::pvData::PVStructure::shared_pointer const & putData,epics::pvData::PVStructure::shared_pointer const & getData)
{
std::cout << "channelGetPutConnect(" << status.toString() << ")" << std::endl;
@@ -280,8 +280,8 @@ class ChannelRPCRequesterImpl : public ChannelRPCRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
}
virtual void channelRPCConnect(const epics::pvData::Status& status,ChannelRPC::shared_pointer& channelRPC,
epics::pvData::PVStructure::shared_pointer& pvStructure,epics::pvData::BitSet::shared_pointer& bitSet)
virtual void channelRPCConnect(const epics::pvData::Status& status,ChannelRPC::shared_pointer const & channelRPC,
epics::pvData::PVStructure::shared_pointer const & pvStructure,epics::pvData::BitSet::shared_pointer const & bitSet)
{
std::cout << "channelRPCConnect(" << status.toString() << ")" << std::endl;
if (status.isSuccess())
@@ -296,7 +296,7 @@ class ChannelRPCRequesterImpl : public ChannelRPCRequester
m_bitSet = bitSet;
}
virtual void requestDone(const epics::pvData::Status& status,epics::pvData::PVStructure::shared_pointer& pvResponse)
virtual void requestDone(const epics::pvData::Status& status,epics::pvData::PVStructure::shared_pointer const & pvResponse)
{
std::cout << "requestDone(" << status.toString() << ")" << std::endl;
if (status.isSuccess())
@@ -328,8 +328,8 @@ class ChannelArrayRequesterImpl : public ChannelArrayRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
}
virtual void channelArrayConnect(const epics::pvData::Status& status,ChannelArray::shared_pointer& channelArray,
epics::pvData::PVArray::shared_pointer& pvArray)
virtual void channelArrayConnect(const epics::pvData::Status& status,ChannelArray::shared_pointer const & channelArray,
epics::pvData::PVArray::shared_pointer const & pvArray)
{
std::cout << "channelArrayConnect(" << status.toString() << ")" << std::endl;
if (status.isSuccess())
@@ -378,7 +378,7 @@ class MonitorRequesterImpl : public MonitorRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
}
virtual void monitorConnect(const epics::pvData::Status& status, Monitor::shared_pointer& monitor, StructureConstPtr& structure)
virtual void monitorConnect(const epics::pvData::Status& status, Monitor::shared_pointer const & monitor, StructureConstPtr const & structure)
{
std::cout << "monitorConnect(" << status.toString() << ")" << std::endl;
if (status.isSuccess() && structure)
@@ -389,7 +389,7 @@ class MonitorRequesterImpl : public MonitorRequester
}
}
virtual void monitorEvent(Monitor::shared_pointer& monitor)
virtual void monitorEvent(Monitor::shared_pointer const & monitor)
{
std::cout << "monitorEvent" << std::endl;
@@ -406,7 +406,7 @@ class MonitorRequesterImpl : public MonitorRequester
monitor->release(element);
}
virtual void unlisten(Monitor::shared_pointer& monitor)
virtual void unlisten(Monitor::shared_pointer const & monitor)
{
std::cout << "unlisten" << std::endl;
}
@@ -415,7 +415,7 @@ class MonitorRequesterImpl : public MonitorRequester
class ChannelProcessRequesterImpl : public ChannelProcessRequester
{
//ChannelProcess::shared_pointer& m_channelProcess;
//ChannelProcess::shared_pointer const & m_channelProcess;
virtual String getRequesterName()
{
@@ -427,7 +427,7 @@ class ChannelProcessRequesterImpl : public ChannelProcessRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
}
virtual void channelProcessConnect(const epics::pvData::Status& status,ChannelProcess::shared_pointer& channelProcess)
virtual void channelProcessConnect(const epics::pvData::Status& status,ChannelProcess::shared_pointer const & channelProcess)
{
std::cout << "channelProcessConnect(" << status.toString() << ")" << std::endl;

92
testApp/remote/testServer.cpp
View File

@@ -26,7 +26,7 @@ class MockChannelProcess :
PVScalar* m_valueField;
protected:
MockChannelProcess(ChannelProcessRequester::shared_pointer& channelProcessRequester, PVStructure::shared_pointer& pvStructure, PVStructure::shared_pointer& pvRequest) :
MockChannelProcess(ChannelProcessRequester::shared_pointer const & channelProcessRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest) :
m_channelProcessRequester(channelProcessRequester), m_pvStructure(pvStructure)
{
PVDATA_REFCOUNT_MONITOR_CONSTRUCT(mockChannelProcess);
@@ -56,7 +56,7 @@ class MockChannelProcess :
}
public:
static ChannelProcess::shared_pointer create(ChannelProcessRequester::shared_pointer& channelProcessRequester, PVStructure::shared_pointer& pvStructure, PVStructure::shared_pointer& pvRequest)
static ChannelProcess::shared_pointer create(ChannelProcessRequester::shared_pointer const & channelProcessRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest)
{
ChannelProcess::shared_pointer thisPtr(new MockChannelProcess(channelProcessRequester, pvStructure, pvRequest));
@@ -174,7 +174,7 @@ class MockChannelGet : public ChannelGet
bool m_first;
protected:
MockChannelGet(ChannelGetRequester::shared_pointer& channelGetRequester, PVStructure::shared_pointer& pvStructure, PVStructure::shared_pointer& pvRequest) :
MockChannelGet(ChannelGetRequester::shared_pointer const & channelGetRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest) :
m_channelGetRequester(channelGetRequester), m_pvStructure(pvStructure),
m_bitSet(new BitSet(pvStructure->getNumberFields())), m_first(true)
{
@@ -182,7 +182,7 @@ class MockChannelGet : public ChannelGet
}
public:
static ChannelGet::shared_pointer create(ChannelGetRequester::shared_pointer& channelGetRequester, PVStructure::shared_pointer& pvStructure, PVStructure::shared_pointer& pvRequest)
static ChannelGet::shared_pointer create(ChannelGetRequester::shared_pointer const & channelGetRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest)
{
ChannelGet::shared_pointer thisPtr(new MockChannelGet(channelGetRequester, pvStructure, pvRequest));
// TODO pvRequest
@@ -228,7 +228,7 @@ class MockChannelPut : public ChannelPut
BitSet::shared_pointer m_bitSet;
protected:
MockChannelPut(ChannelPutRequester::shared_pointer& channelPutRequester, PVStructure::shared_pointer& pvStructure, PVStructure::shared_pointer& pvRequest) :
MockChannelPut(ChannelPutRequester::shared_pointer const & channelPutRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest) :
m_channelPutRequester(channelPutRequester), m_pvStructure(pvStructure),
m_bitSet(new BitSet(pvStructure->getNumberFields()))
{
@@ -236,7 +236,7 @@ class MockChannelPut : public ChannelPut
}
public:
static ChannelPut::shared_pointer create(ChannelPutRequester::shared_pointer& channelPutRequester, PVStructure::shared_pointer& pvStructure, PVStructure::shared_pointer& pvRequest)
static ChannelPut::shared_pointer create(ChannelPutRequester::shared_pointer const & channelPutRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest)
{
ChannelPut::shared_pointer thisPtr(new MockChannelPut(channelPutRequester, pvStructure, pvRequest));
// TODO pvRequest
@@ -281,14 +281,14 @@ class MockChannelPutGet : public ChannelPutGet
PVStructure::shared_pointer m_pvStructure;
protected:
MockChannelPutGet(ChannelPutGetRequester::shared_pointer& channelPutGetRequester, PVStructure::shared_pointer& pvStructure, PVStructure::shared_pointer& pvRequest) :
MockChannelPutGet(ChannelPutGetRequester::shared_pointer const & channelPutGetRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest) :
m_channelPutGetRequester(channelPutGetRequester), m_pvStructure(pvStructure)
{
PVDATA_REFCOUNT_MONITOR_CONSTRUCT(mockChannelPutGet);
}
public:
static ChannelPutGet::shared_pointer create(ChannelPutGetRequester::shared_pointer& channelPutGetRequester, PVStructure::shared_pointer& pvStructure, PVStructure::shared_pointer& pvRequest)
static ChannelPutGet::shared_pointer create(ChannelPutGetRequester::shared_pointer const & channelPutGetRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest)
{
ChannelPutGet::shared_pointer thisPtr(new MockChannelPutGet(channelPutGetRequester, pvStructure, pvRequest));
// TODO pvRequest
@@ -340,7 +340,7 @@ class MockChannelRPC : public ChannelRPC
BitSet::shared_pointer m_bitSet;
protected:
MockChannelRPC(ChannelRPCRequester::shared_pointer& channelRPCRequester, PVStructure::shared_pointer& pvStructure, PVStructure::shared_pointer& pvRequest) :
MockChannelRPC(ChannelRPCRequester::shared_pointer const & channelRPCRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest) :
m_channelRPCRequester(channelRPCRequester), m_pvStructure(pvStructure),
m_bitSet(new BitSet(pvStructure->getNumberFields()))
{
@@ -348,7 +348,7 @@ class MockChannelRPC : public ChannelRPC
}
public:
static ChannelRPC::shared_pointer create(ChannelRPCRequester::shared_pointer& channelRPCRequester, PVStructure::shared_pointer& pvStructure, PVStructure::shared_pointer& pvRequest)
static ChannelRPC::shared_pointer create(ChannelRPCRequester::shared_pointer const & channelRPCRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest)
{
ChannelRPC::shared_pointer thisPtr(new MockChannelRPC(channelRPCRequester, pvStructure, pvRequest));
// TODO pvRequest
@@ -392,7 +392,7 @@ class MockChannelArray : public ChannelArray
PVArray::shared_pointer m_pvArray;
protected:
MockChannelArray(ChannelArrayRequester::shared_pointer& channelArrayRequester, PVStructure::shared_pointer& pvStructure, PVStructure::shared_pointer& pvRequest) :
MockChannelArray(ChannelArrayRequester::shared_pointer const & channelArrayRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest) :
m_channelArrayRequester(channelArrayRequester),
m_pvArray(getPVDataCreate()->createPVScalarArray(0, "", pvDouble))
{
@@ -400,7 +400,7 @@ class MockChannelArray : public ChannelArray
}
public:
static ChannelArray::shared_pointer create(ChannelArrayRequester::shared_pointer& channelArrayRequester, PVStructure::shared_pointer& pvStructure, PVStructure::shared_pointer& pvRequest)
static ChannelArray::shared_pointer create(ChannelArrayRequester::shared_pointer const & channelArrayRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest)
{
ChannelArray::shared_pointer thisPtr(new MockChannelArray(channelArrayRequester, pvStructure, pvRequest));
@@ -464,7 +464,7 @@ class MockMonitor : public Monitor, public MonitorElement, public std::tr1::enab
int m_count;
protected:
MockMonitor(MonitorRequester::shared_pointer& monitorRequester, PVStructure::shared_pointer& pvStructure, PVStructure::shared_pointer& pvRequest) :
MockMonitor(MonitorRequester::shared_pointer const & monitorRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest) :
m_monitorRequester(monitorRequester), m_pvStructure(pvStructure),
m_changedBitSet(new BitSet(pvStructure->getNumberFields())),
m_overrunBitSet(new BitSet(pvStructure->getNumberFields())),
@@ -478,7 +478,7 @@ class MockMonitor : public Monitor, public MonitorElement, public std::tr1::enab
}
public:
static Monitor::shared_pointer create(MonitorRequester::shared_pointer& monitorRequester, PVStructure::shared_pointer& pvStructure, PVStructure::shared_pointer& pvRequest)
static Monitor::shared_pointer create(MonitorRequester::shared_pointer const & monitorRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest)
{
Monitor::shared_pointer thisPtr(new MockMonitor(monitorRequester, pvStructure, pvRequest));
@@ -508,7 +508,7 @@ class MockMonitor : public Monitor, public MonitorElement, public std::tr1::enab
return Status::OK;
}
virtual MonitorElement::shared_pointer poll()
virtual MonitorElement::shared_pointer const & poll()
{
Lock xx(m_lock);
if (m_count)
@@ -523,7 +523,7 @@ class MockMonitor : public Monitor, public MonitorElement, public std::tr1::enab
}
}
virtual void release(MonitorElement::shared_pointer& monitorElement)
virtual void release(MonitorElement::shared_pointer const & monitorElement)
{
Lock xx(m_lock);
if (m_count)
@@ -537,17 +537,17 @@ class MockMonitor : public Monitor, public MonitorElement, public std::tr1::enab
// ============ MonitorElement ============
virtual PVStructure::shared_pointer getPVStructure()
virtual PVStructure::shared_pointer const & getPVStructure()
{
return m_pvStructure;
}
virtual BitSet::shared_pointer getChangedBitSet()
virtual BitSet::shared_pointer const & getChangedBitSet()
{
return m_changedBitSet;
}
virtual BitSet::shared_pointer getOverrunBitSet()
virtual BitSet::shared_pointer const & getOverrunBitSet()
{
return m_overrunBitSet;
}
@@ -655,12 +655,12 @@ class MockChannel : public Channel {
return getConnectionState() == CONNECTED;
}
virtual AccessRights getAccessRights(epics::pvData::PVField::shared_pointer& pvField)
virtual AccessRights getAccessRights(epics::pvData::PVField::shared_pointer const & pvField)
{
return readWrite;
}
virtual void getField(GetFieldRequester::shared_pointer& requester,epics::pvData::String subField)
virtual void getField(GetFieldRequester::shared_pointer const & requester,epics::pvData::String subField)
{
PVFieldPtr pvField;
if(subField == "")
@@ -685,49 +685,49 @@ class MockChannel : public Channel {
}
virtual ChannelProcess::shared_pointer createChannelProcess(
ChannelProcessRequester::shared_pointer& channelProcessRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest)
ChannelProcessRequester::shared_pointer const & channelProcessRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
{
return MockChannelProcess::create(channelProcessRequester, m_pvStructure, pvRequest);
}
virtual ChannelGet::shared_pointer createChannelGet(
ChannelGetRequester::shared_pointer& channelGetRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest)
ChannelGetRequester::shared_pointer const & channelGetRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
{
return MockChannelGet::create(channelGetRequester, m_pvStructure, pvRequest);
}
virtual ChannelPut::shared_pointer createChannelPut(
ChannelPutRequester::shared_pointer& channelPutRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest)
ChannelPutRequester::shared_pointer const & channelPutRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
{
return MockChannelPut::create(channelPutRequester, m_pvStructure, pvRequest);
}
virtual ChannelPutGet::shared_pointer createChannelPutGet(
ChannelPutGetRequester::shared_pointer& channelPutGetRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest)
ChannelPutGetRequester::shared_pointer const & channelPutGetRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
{
return MockChannelPutGet::create(channelPutGetRequester, m_pvStructure, pvRequest);
}
virtual ChannelRPC::shared_pointer createChannelRPC(ChannelRPCRequester::shared_pointer& channelRPCRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest)
virtual ChannelRPC::shared_pointer createChannelRPC(ChannelRPCRequester::shared_pointer const & channelRPCRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
{
return MockChannelRPC::create(channelRPCRequester, m_pvStructure, pvRequest);
}
virtual epics::pvData::Monitor::shared_pointer createMonitor(
epics::pvData::MonitorRequester::shared_pointer& monitorRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest)
epics::pvData::MonitorRequester::shared_pointer const & monitorRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
{
return MockMonitor::create(monitorRequester, m_pvStructure, pvRequest);
}
virtual ChannelArray::shared_pointer createChannelArray(
ChannelArrayRequester::shared_pointer& channelArrayRequester,
epics::pvData::PVStructure::shared_pointer& pvRequest)
ChannelArrayRequester::shared_pointer const & channelArrayRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
{
return MockChannelArray::create(channelArrayRequester, m_pvStructure, pvRequest);
}
@@ -816,7 +816,7 @@ class MockServerChannelProvider : public ChannelProvider,
virtual ChannelFind::shared_pointer channelFind(
epics::pvData::String channelName,
ChannelFindRequester::shared_pointer& channelFindRequester)
ChannelFindRequester::shared_pointer const & channelFindRequester)
{
// channel always exists
channelFindRequester->channelFindResult(Status::OK, m_mockChannelFind, true);
@@ -825,7 +825,7 @@ class MockServerChannelProvider : public ChannelProvider,
virtual Channel::shared_pointer createChannel(
epics::pvData::String channelName,
ChannelRequester::shared_pointer& channelRequester,
ChannelRequester::shared_pointer const & channelRequester,
short priority)
{
return createChannel(channelName, channelRequester, priority, "local");
@@ -833,7 +833,7 @@ class MockServerChannelProvider : public ChannelProvider,
virtual Channel::shared_pointer createChannel(
epics::pvData::String channelName,
ChannelRequester::shared_pointer& channelRequester,
ChannelRequester::shared_pointer const & channelRequester,
short priority,
epics::pvData::String address)
{
@@ -934,8 +934,8 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
}
virtual void channelGetConnect(const epics::pvData::Status& status, ChannelGet::shared_pointer& channelGet,
epics::pvData::PVStructure::shared_pointer& pvStructure, epics::pvData::BitSet::shared_pointer& bitSet)
virtual void channelGetConnect(const epics::pvData::Status& status, ChannelGet::shared_pointer const & channelGet,
epics::pvData::PVStructure::shared_pointer const & pvStructure, epics::pvData::BitSet::shared_pointer const & bitSet)
{
std::cout << "channelGetConnect(" << status.toString() << ")" << std::endl;
@@ -970,8 +970,8 @@ class ChannelPutRequesterImpl : public ChannelPutRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
}
virtual void channelPutConnect(const epics::pvData::Status& status,ChannelPut::shared_pointer& channelPut,
epics::pvData::PVStructure::shared_pointer& pvStructure, epics::pvData::BitSet::shared_pointer& bitSet)
virtual void channelPutConnect(const epics::pvData::Status& status,ChannelPut::shared_pointer const & channelPut,
epics::pvData::PVStructure::shared_pointer const & pvStructure, epics::pvData::BitSet::shared_pointer const & bitSet)
{
std::cout << "channelPutConnect(" << status.toString() << ")" << std::endl;
@@ -1013,7 +1013,7 @@ class MonitorRequesterImpl : public MonitorRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
}
virtual void monitorConnect(const Status& status, Monitor::shared_pointer& monitor, StructureConstPtr& structure)
virtual void monitorConnect(const Status& status, Monitor::shared_pointer const & monitor, StructureConstPtr& structure)
{
std::cout << "monitorConnect(" << status.toString() << ")" << std::endl;
if (structure)
@@ -1024,7 +1024,7 @@ class MonitorRequesterImpl : public MonitorRequester
}
}
virtual void monitorEvent(Monitor::shared_pointer& monitor)
virtual void monitorEvent(Monitor::shared_pointer const & monitor)
{
std::cout << "monitorEvent" << std::endl;
@@ -1041,7 +1041,7 @@ class MonitorRequesterImpl : public MonitorRequester
monitor->release(element);
}
virtual void unlisten(Monitor::shared_pointer& monitor)
virtual void unlisten(Monitor::shared_pointer const & monitor)
{
std::cout << "unlisten" << std::endl;
}
@@ -1062,7 +1062,7 @@ class ChannelProcessRequesterImpl : public ChannelProcessRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
}
virtual void channelProcessConnect(const epics::pvData::Status& status,ChannelProcess::shared_pointer& channelProcess)
virtual void channelProcessConnect(const epics::pvData::Status& status,ChannelProcess::shared_pointer const & channelProcess)
{
std::cout << "channelProcessConnect(" << status.toString() << ")" << std::endl;

6
testApp/remote/testServerContext.cpp
View File

@@ -18,7 +18,7 @@ public:
ChannelFind::shared_pointer channelFind(epics::pvData::String channelName,
ChannelFindRequester::shared_pointer& channelFindRequester)
ChannelFindRequester::shared_pointer const & channelFindRequester)
{
ChannelFind::shared_pointer nullCF;
channelFindRequester->channelFindResult(Status::OK, nullCF, false);
@@ -27,7 +27,7 @@ public:
Channel::shared_pointer createChannel(
epics::pvData::String channelName,
ChannelRequester::shared_pointer& channelRequester,
ChannelRequester::shared_pointer const & channelRequester,
short priority = PRIORITY_DEFAULT)
{
return createChannel(channelName, channelRequester, priority, "");
@@ -35,7 +35,7 @@ public:
Channel::shared_pointer createChannel(
epics::pvData::String channelName,
ChannelRequester::shared_pointer& channelRequester,
ChannelRequester::shared_pointer const & channelRequester,
short priority, epics::pvData::String address)
{
Channel::shared_pointer nullC;

2
testApp/utils/transportRegistryTest.cpp
View File

@@ -43,7 +43,7 @@ namespace epics {
virtual bool isClosed() {return false;};
virtual bool isVerified() {return false;};
virtual void verified(){};
virtual void enqueueSendRequest(TransportSender::shared_pointer& sender){};
virtual void enqueueSendRequest(TransportSender::shared_pointer const & sender){};
virtual void ensureData(int) {};
virtual IntrospectionRegistry* getIntrospectionRegistry() {return NULL;};
private: