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

unused params warnings removed

Browse Source
This commit is contained in:
Matej Sekoranja
2012-10-10 12:02:12 +02:00
parent 6f653cc3af
commit e11cca0fdb
33 changed files with 190 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pvAccessApp/remote/abstractResponseHandler.cpp
View File

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

8
pvAccessApp/remote/beaconHandler.cpp
View File

@@ -37,17 +37,17 @@ BeaconHandler::~BeaconHandler()
}
void BeaconHandler::beaconNotify(osiSockAddr* from, int8 remoteTransportRevision,
void BeaconHandler::beaconNotify(osiSockAddr* /*from*/, int8 remoteTransportRevision,
TimeStamp* timestamp, TimeStamp* startupTime, int16 sequentalID,
PVFieldPtr data)
PVFieldPtr /*data*/)
{
bool networkChanged = updateBeacon(remoteTransportRevision, timestamp, startupTime, sequentalID);
if (networkChanged)
changedTransport();
}
bool BeaconHandler::updateBeacon(int8 remoteTransportRevision, TimeStamp* timestamp,
TimeStamp* startupTime, int16 sequentalID)
bool BeaconHandler::updateBeacon(int8 /*remoteTransportRevision*/, TimeStamp* /*timestamp*/,
TimeStamp* startupTime, int16 /*sequentalID*/)
{
Lock guard(_mutex);
// first beacon notification check

2
pvAccessApp/remote/blockingClientTCPTransport.cpp
View File

@@ -27,7 +27,7 @@ namespace epics {
BlockingClientTCPTransport::BlockingClientTCPTransport(
Context::shared_pointer const & context, SOCKET channel,
auto_ptr<ResponseHandler>& responseHandler, int receiveBufferSize,
TransportClient::shared_pointer client, int8 remoteTransportRevision,
TransportClient::shared_pointer client, int8 /*remoteTransportRevision*/,
float beaconInterval, int16 priority) :
BlockingTCPTransport(context, channel, responseHandler, receiveBufferSize, priority),
_connectionTimeout(beaconInterval*1000),

12
pvAccessApp/remote/blockingTCP.h
View File

@@ -120,7 +120,7 @@ namespace epics {
_verifiedEvent.signal();
}
virtual void setRecipient(const osiSockAddr& sendTo) {
virtual void setRecipient(const osiSockAddr& /*sendTo*/) {
// noop
}
@@ -142,7 +142,7 @@ namespace epics {
virtual void close();
virtual void setByteOrder(int byteOrder)
virtual void setByteOrder(int /*byteOrder*/)
{
// not used this this implementation
}
@@ -667,12 +667,12 @@ namespace epics {
return thisPointer;
}
virtual bool acquire(std::tr1::shared_ptr<TransportClient> const & client)
virtual bool acquire(std::tr1::shared_ptr<TransportClient> const & /*client*/)
{
return false;
}
virtual void release(pvAccessID clientId) {}
virtual void release(pvAccessID /*clientId*/) {}
/**
* Preallocate new channel SID.
@@ -684,7 +684,7 @@ namespace epics {
* De-preallocate new channel SID.
* @param sid preallocated channel SID.
*/
virtual void depreallocateChannelSID(pvAccessID sid) {
virtual void depreallocateChannelSID(pvAccessID /*sid*/) {
// noop
}
@@ -737,7 +737,7 @@ namespace epics {
/**
* Verify transport. Server side is self-verified.
*/
virtual bool verify(epics::pvData::int32 timeoutMs) {
virtual bool verify(epics::pvData::int32 /*timeoutMs*/) {
TransportSender::shared_pointer transportSender = std::tr1::dynamic_pointer_cast<TransportSender>(shared_from_this());
enqueueSendRequest(transportSender);
verified();

4
pvAccessApp/remote/blockingTCPTransport.cpp
View File

@@ -274,14 +274,14 @@ namespace pvAccess {
internalPostClose(force);
}
void BlockingTCPTransport::internalClose(bool force) {
void BlockingTCPTransport::internalClose(bool /*force*/) {
// close the socket
if(_channel!=INVALID_SOCKET) {
epicsSocketDestroy(_channel);
}
}
void BlockingTCPTransport::internalPostClose(bool force) {
void BlockingTCPTransport::internalPostClose(bool /*force*/) {
}
size_t BlockingTCPTransport::getSocketReceiveBufferSize() const {

18
pvAccessApp/remote/blockingUDP.h
View File

@@ -77,17 +77,17 @@ namespace epics {
return CA_PROTOCOL_REVISION;
}
virtual void setRemoteRevision(epics::pvData::int8 revision) {
virtual void setRemoteRevision(epics::pvData::int8 /*revision*/) {
// noop
}
virtual void setRemoteTransportReceiveBufferSize(
std::size_t receiveBufferSize) {
std::size_t /*receiveBufferSize*/) {
// noop for UDP (limited by 64k; MAX_UDP_SEND for CA)
}
virtual void setRemoteTransportSocketReceiveBufferSize(
std::size_t socketReceiveBufferSize) {
std::size_t /*socketReceiveBufferSize*/) {
// noop for UDP (limited by 64k; MAX_UDP_SEND for CA)
}
@@ -99,7 +99,7 @@ namespace epics {
// noop
}
virtual bool verify(epics::pvData::int32 timeoutMs) {
virtual bool verify(epics::pvData::int32 /*timeoutMs*/) {
// noop
return true;
}
@@ -123,7 +123,7 @@ namespace epics {
virtual void close();
virtual void ensureData(std::size_t size) {
virtual void ensureData(std::size_t /*size*/) {
// noop
}
@@ -134,7 +134,7 @@ namespace epics {
virtual void startMessage(epics::pvData::int8 command, std::size_t ensureCapacity);
virtual void endMessage();
virtual void flush(bool lastMessageCompleted) {
virtual void flush(bool /*lastMessageCompleted*/) {
// noop since all UDP requests are sent immediately
}
@@ -147,7 +147,7 @@ namespace epics {
// noop
}
virtual void ensureBuffer(std::size_t size) {
virtual void ensureBuffer(std::size_t /*size*/) {
// noop
}
@@ -170,12 +170,12 @@ namespace epics {
return epics::pvData::getFieldCreate()->deserialize(buffer, this);
}
virtual bool acquire(std::tr1::shared_ptr<TransportClient> const & client)
virtual bool acquire(std::tr1::shared_ptr<TransportClient> const & /*client*/)
{
return false;
}
virtual void release(pvAccessID clientId) {}
virtual void release(pvAccessID /*clientId*/) {}
/**
* Set ignore list.

4
pvAccessApp/remote/blockingUDPConnector.cpp
View File

@@ -18,9 +18,9 @@ using namespace epics::pvData;
namespace epics {
namespace pvAccess {
Transport::shared_pointer BlockingUDPConnector::connect(TransportClient::shared_pointer const & client,
Transport::shared_pointer BlockingUDPConnector::connect(TransportClient::shared_pointer const & /*client*/,
auto_ptr<ResponseHandler>& responseHandler, osiSockAddr& bindAddress,
int8 transportRevision, int16 priority) {
int8 transportRevision, int16 /*priority*/) {
LOG(logLevelDebug, "Creating datagram socket to: %s",
inetAddressToString(bindAddress).c_str());

4
pvAccessApp/remote/blockingUDPTransport.cpp
View File

@@ -38,7 +38,7 @@ inline int sendto(int s, const char *buf, size_t len, int flags, const struct so
BlockingUDPTransport::BlockingUDPTransport(
auto_ptr<ResponseHandler>& responseHandler, SOCKET channel,
osiSockAddr& bindAddress,
short remoteTransportRevision) :
short /*remoteTransportRevision*/) :
_closed(),
_responseHandler(responseHandler),
_channel(channel),
@@ -144,7 +144,7 @@ inline int sendto(int s, const char *buf, size_t len, int flags, const struct so
}
}
void BlockingUDPTransport::startMessage(int8 command, size_t ensureCapacity) {
void BlockingUDPTransport::startMessage(int8 command, size_t /*ensureCapacity*/) {
_lastMessageStartPosition = _sendBuffer->getPosition();
_sendBuffer->putByte(CA_MAGIC);
_sendBuffer->putByte(CA_VERSION);

2
pvAccessApp/remote/simpleChannelSearchManagerImpl.cpp
View File

@@ -125,7 +125,7 @@ void SimpleChannelSearchManagerImpl::unregisterSearchInstance(SearchInstance::sh
m_channels.erase(id);
}
void SimpleChannelSearchManagerImpl::searchResponse(pvAccessID cid, int32_t seqNo, int8_t minorRevision, osiSockAddr* serverAddress)
void SimpleChannelSearchManagerImpl::searchResponse(pvAccessID cid, int32_t /*seqNo*/, int8_t minorRevision, osiSockAddr* serverAddress)
{
Lock guard(m_channelMutex);
std::map<pvAccessID,SearchInstance::shared_pointer>::iterator channelsIter = m_channels.find(cid);

10
pvAccessApp/remote/simpleChannelSearchManagerImpl.h
View File

@@ -21,11 +21,11 @@ class MockTransportSendControl: public TransportSendControl
{
public:
void endMessage() {}
void flush(bool lastMessageCompleted) {}
void setRecipient(const osiSockAddr& sendTo) {}
void startMessage(epics::pvData::int8 command, std::size_t ensureCapacity) {}
void ensureBuffer(std::size_t) {}
void alignBuffer(std::size_t alignment) {}
void flush(bool /*lastMessageCompleted*/) {}
void setRecipient(const osiSockAddr& /*sendTo*/) {}
void startMessage(epics::pvData::int8 /*command*/, std::size_t /*ensureCapacity*/) {}
void ensureBuffer(std::size_t /*size*/) {}
void alignBuffer(std::size_t /*alignment*/) {}
void flushSerializeBuffer() {}
void cachedSerialize(const std::tr1::shared_ptr<const epics::pvData::Field>& field, epics::pvData::ByteBuffer* buffer)
{

6
pvAccessApp/remote/transportRegistry.cpp
View File

@@ -48,7 +48,7 @@ void TransportRegistry::put(Transport::shared_pointer const & transport)
(*priorities)[priority] = transport;
}
Transport::shared_pointer TransportRegistry::get(String const & type, const osiSockAddr* address, const int16 priority)
Transport::shared_pointer TransportRegistry::get(String const & /*type*/, const osiSockAddr* address, const int16 priority)
{
Lock guard(_mutex);
transportsMap_t::iterator transportsIter = _transports.find(address);
@@ -64,7 +64,7 @@ Transport::shared_pointer TransportRegistry::get(String const & type, const osiS
return Transport::shared_pointer();
}
auto_ptr<TransportRegistry::transportVector_t> TransportRegistry::get(String const & type, const osiSockAddr* address)
auto_ptr<TransportRegistry::transportVector_t> TransportRegistry::get(String const & /*type*/, const osiSockAddr* address)
{
Lock guard(_mutex);
transportsMap_t::iterator transportsIter = _transports.find(address);
@@ -122,7 +122,7 @@ int32 TransportRegistry::numberOfActiveTransports()
return _transportCount;
}
auto_ptr<TransportRegistry::transportVector_t> TransportRegistry::toArray(String const & type)
auto_ptr<TransportRegistry::transportVector_t> TransportRegistry::toArray(String const & /*type*/)
{
// TODO support type
return toArray();

58
pvAccessApp/remoteClient/clientContextImpl.cpp
View File

@@ -417,18 +417,18 @@ namespace epics {
stopRequest();
}
virtual bool destroyResponse(Transport::shared_pointer const & 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 const & 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 const & 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;
}
@@ -569,7 +569,7 @@ namespace epics {
return true;
}
virtual bool initResponse(Transport::shared_pointer const & 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());
@@ -590,7 +590,7 @@ namespace epics {
return true;
}
virtual bool normalResponse(Transport::shared_pointer const & 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));
@@ -767,12 +767,12 @@ namespace epics {
stopRequest();
}
virtual bool destroyResponse(Transport::shared_pointer const & 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 const & 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 thisChannelPut = dynamic_pointer_cast<ChannelPut>(shared_from_this());
@@ -793,7 +793,7 @@ namespace epics {
return true;
}
virtual bool normalResponse(Transport::shared_pointer const & 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())
@@ -994,7 +994,7 @@ namespace epics {
return normalResponse(transport, version, payloadBuffer, qos, status);
}
virtual bool initResponse(Transport::shared_pointer const & 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 thisChannelPutGet = dynamic_pointer_cast<ChannelPutGet>(shared_from_this());
@@ -1015,7 +1015,7 @@ namespace epics {
}
virtual bool normalResponse(Transport::shared_pointer const & 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())
@@ -1272,7 +1272,7 @@ namespace epics {
return normalResponse(transport, version, payloadBuffer, qos, status);
}
virtual bool initResponse(Transport::shared_pointer const & 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 thisChannelRPC = dynamic_pointer_cast<ChannelRPC>(shared_from_this());
@@ -1286,7 +1286,7 @@ namespace epics {
return true;
}
virtual bool normalResponse(Transport::shared_pointer const & 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_channelRPCRequester->requestDone(status, nullPVStructure));
@@ -1471,7 +1471,7 @@ namespace epics {
return true;
}
virtual bool initResponse(Transport::shared_pointer const & 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 thisChannelArray = dynamic_pointer_cast<ChannelArray>(shared_from_this());
@@ -1492,7 +1492,7 @@ namespace epics {
return true;
}
virtual bool normalResponse(Transport::shared_pointer const & 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())
@@ -1761,7 +1761,7 @@ namespace epics {
m_thisPointer.reset();
}
virtual void response(Transport::shared_pointer const & transport, int8 version, ByteBuffer* payloadBuffer) {
virtual void response(Transport::shared_pointer const & transport, int8 /*version*/, ByteBuffer* payloadBuffer) {
Status status;
status.deserialize(payloadBuffer, transport.get());
@@ -1823,11 +1823,11 @@ namespace epics {
{
}
virtual void init(StructureConstPtr const & structure) {
virtual void init(StructureConstPtr const & /*structure*/) {
// noop
}
virtual void response(Transport::shared_pointer const & transport, ByteBuffer* payloadBuffer) {
virtual void response(Transport::shared_pointer const & /*transport*/, ByteBuffer* /*payloadBuffer*/) {
Lock guard(m_mutex);
m_gotMonitor = true;
// no data, only notify
@@ -1845,7 +1845,7 @@ namespace epics {
return m_nullMonitorElement;
}
virtual void release(MonitorElement::shared_pointer const & monitorElement) {
virtual void release(MonitorElement::shared_pointer const & /*monitorElement*/) {
// noop
}
@@ -1923,7 +1923,7 @@ namespace epics {
return m_nullMonitorElement;
}
virtual void release(MonitorElement::shared_pointer const & monitorElement) {
virtual void release(MonitorElement::shared_pointer const & /*monitorElement*/) {
// noop
}
@@ -2037,7 +2037,7 @@ namespace epics {
return m_monitorElement;
}
virtual void release(MonitorElement::shared_pointer const & monitorElement) {
virtual void release(MonitorElement::shared_pointer const & /*monitorElement*/) {
// noop
}
@@ -2264,7 +2264,7 @@ namespace epics {
return m_nullMonitorElement;
}
virtual void release(MonitorElement::shared_pointer const & monitorElement) {
virtual void release(MonitorElement::shared_pointer const & /*monitorElement*/) {
Lock guard(m_mutex);
//monitorQueue.releaseUsed(monitorElement);
m_needToReleaseFirst = false;
@@ -2407,7 +2407,7 @@ namespace epics {
return normalResponse(transport, version, payloadBuffer, qos, status);
}
virtual bool initResponse(Transport::shared_pointer const & 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 thisChannelMonitor = dynamic_pointer_cast<Monitor>(shared_from_this());
@@ -2431,7 +2431,7 @@ namespace epics {
return true;
}
virtual bool normalResponse(Transport::shared_pointer const & 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...
@@ -2596,8 +2596,8 @@ namespace epics {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer const & transport, int8 version, int8 command,
size_t payloadSize, epics::pvData::ByteBuffer* payloadBuffer)
Transport::shared_pointer const & /*transport*/, int8 /*version*/, int8 command,
size_t /*payloadSize*/, epics::pvData::ByteBuffer* /*payloadBuffer*/)
{
char ipAddrStr[48];
ipAddrToDottedIP(&responseFrom->ia, ipAddrStr, sizeof(ipAddrStr));
@@ -3494,7 +3494,7 @@ namespace epics {
* @throws std::runtime_error
* @throws IOException
*/
void destroyChannel(bool force) {
void destroyChannel(bool /*force*/) {
{
Lock guard(m_channelMutex);
@@ -3657,7 +3657,7 @@ namespace epics {
return m_transport;
}
virtual void transportResponsive(Transport::shared_pointer const & transport) {
virtual void transportResponsive(Transport::shared_pointer const & /*transport*/) {
Lock guard(m_channelMutex);
if (m_connectionState == DISCONNECTED)
{
@@ -4292,7 +4292,7 @@ TODO
Lock guard(m_cidMapMutex);
// search first free (theoretically possible loop of death)
while (m_channelsByCID.find(++m_lastCID) != m_channelsByCID.end());
while (m_channelsByCID.find(++m_lastCID) != m_channelsByCID.end()) ;
// reserve CID
m_channelsByCID[m_lastCID].reset();
return m_lastCID;
@@ -4363,7 +4363,7 @@ TODO
// search first free (theoretically possible loop of death)
do {
while (m_pendingResponseRequests.find(++m_lastIOID) != m_pendingResponseRequests.end());
while (m_pendingResponseRequests.find(++m_lastIOID) != m_pendingResponseRequests.end()) ;
} while (m_lastIOID == INVALID_IOID);
// reserve IOID

28
pvAccessApp/rpcService/rpcServer.cpp
View File

@@ -178,19 +178,19 @@ public:
}
virtual AccessRights getAccessRights(epics::pvData::PVField::shared_pointer const & pvField)
virtual AccessRights getAccessRights(epics::pvData::PVField::shared_pointer const & /*pvField*/)
{
return none;
}
virtual void getField(GetFieldRequester::shared_pointer const & requester,epics::pvData::String const & subField)
virtual void getField(GetFieldRequester::shared_pointer const & requester,epics::pvData::String const & /*subField*/)
{
requester->getDone(notSupportedStatus, epics::pvData::Field::shared_pointer());
}
virtual ChannelProcess::shared_pointer createChannelProcess(
ChannelProcessRequester::shared_pointer const & channelProcessRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
{
ChannelProcess::shared_pointer nullPtr;
channelProcessRequester->channelProcessConnect(notSupportedStatus, nullPtr);
@@ -199,7 +199,7 @@ public:
virtual ChannelGet::shared_pointer createChannelGet(
ChannelGetRequester::shared_pointer const & channelGetRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
{
ChannelGet::shared_pointer nullPtr;
channelGetRequester->channelGetConnect(notSupportedStatus, nullPtr,
@@ -209,7 +209,7 @@ public:
virtual ChannelPut::shared_pointer createChannelPut(
ChannelPutRequester::shared_pointer const & channelPutRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
{
ChannelPut::shared_pointer nullPtr;
channelPutRequester->channelPutConnect(notSupportedStatus, nullPtr,
@@ -220,7 +220,7 @@ public:
virtual ChannelPutGet::shared_pointer createChannelPutGet(
ChannelPutGetRequester::shared_pointer const & channelPutGetRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
{
ChannelPutGet::shared_pointer nullPtr;
epics::pvData::PVStructure::shared_pointer nullStructure;
@@ -230,7 +230,7 @@ public:
virtual ChannelRPC::shared_pointer createChannelRPC(
ChannelRPCRequester::shared_pointer const & channelRPCRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
{
// nothing expected to be in pvRequest
@@ -251,7 +251,7 @@ public:
virtual epics::pvData::Monitor::shared_pointer createMonitor(
epics::pvData::MonitorRequester::shared_pointer const & monitorRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
{
epics::pvData::Monitor::shared_pointer nullPtr;
monitorRequester->monitorConnect(notSupportedStatus, nullPtr, epics::pvData::Structure::shared_pointer());
@@ -260,7 +260,7 @@ public:
virtual ChannelArray::shared_pointer createChannelArray(
ChannelArrayRequester::shared_pointer const & channelArrayRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest)
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
{
ChannelArray::shared_pointer nullPtr;
channelArrayRequester->channelArrayConnect(notSupportedStatus, nullPtr, epics::pvData::PVArray::shared_pointer());
@@ -351,7 +351,7 @@ public:
virtual Channel::shared_pointer createChannel(
epics::pvData::String const & channelName,
ChannelRequester::shared_pointer const & channelRequester,
short priority)
short /*priority*/)
{
RPCServiceMap::const_iterator iter;
{
@@ -376,10 +376,10 @@ public:
}
virtual Channel::shared_pointer createChannel(
epics::pvData::String const & channelName,
ChannelRequester::shared_pointer const & channelRequester,
short priority,
epics::pvData::String const & address)
epics::pvData::String const & /*channelName*/,
ChannelRequester::shared_pointer const & /*channelRequester*/,
short /*priority*/,
epics::pvData::String const & /*address*/)
{
// this will never get called by the pvAccess server
throw std::runtime_error("not supported");

8
pvAccessApp/server/responseHandlers.cpp
View File

@@ -209,7 +209,7 @@ ServerChannelFindRequesterImpl* ServerChannelFindRequesterImpl::set(String name,
std::map<String, std::tr1::weak_ptr<ChannelProvider> > ServerSearchHandler::s_channelNameToProvider;
void ServerChannelFindRequesterImpl::channelFindResult(const Status& status, ChannelFind::shared_pointer const & channelFind, bool wasFound)
void ServerChannelFindRequesterImpl::channelFindResult(const Status& /*status*/, ChannelFind::shared_pointer const & channelFind, bool wasFound)
{
// TODO status
Lock guard(_mutex);
@@ -411,7 +411,7 @@ void ServerChannelRequesterImpl::channelCreated(const Status& status, Channel::s
}
}
void ServerChannelRequesterImpl::channelStateChange(Channel::shared_pointer const & c, const Channel::ConnectionState isConnected)
void ServerChannelRequesterImpl::channelStateChange(Channel::shared_pointer const & /*channel*/, const Channel::ConnectionState /*isConnected*/)
{
// TODO should we notify remote side?
}
@@ -1262,12 +1262,12 @@ void ServerMonitorRequesterImpl::monitorConnect(const Status& status, Monitor::s
}
}
void ServerMonitorRequesterImpl::unlisten(Monitor::shared_pointer const & monitor)
void ServerMonitorRequesterImpl::unlisten(Monitor::shared_pointer const & /*monitor*/)
{
//TODO
}
void ServerMonitorRequesterImpl::monitorEvent(Monitor::shared_pointer const & 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);

2
pvAccessApp/server/responseHandlers.h
View File

@@ -114,7 +114,7 @@ namespace pvAccess {
virtual ~EchoTransportSender() {
}
virtual void send(epics::pvData::ByteBuffer* buffer, TransportSendControl* control) {
virtual void send(epics::pvData::ByteBuffer* /*buffer*/, TransportSendControl* control) {
control->startMessage(CMD_ECHO, 0);
control->setRecipient(_echoFrom);
// TODO content

2
pvAccessApp/server/serverChannelImpl.cpp
View File

@@ -11,7 +11,7 @@ using namespace epics::pvData;
namespace epics {
namespace pvAccess {
ServerChannelImpl::ServerChannelImpl(Channel::shared_pointer const & channel, pvAccessID cid, pvAccessID sid, epics::pvData::PVField::shared_pointer const & securityToken):
ServerChannelImpl::ServerChannelImpl(Channel::shared_pointer const & channel, pvAccessID cid, pvAccessID sid, epics::pvData::PVField::shared_pointer const & /*securityToken*/):
_channel(channel),
_cid(cid),
_sid(sid),

2
pvAccessApp/server/serverContext.cpp
View File

@@ -546,7 +546,7 @@ TransportRegistry::shared_pointer ServerContextImpl::getTransportRegistry()
return _transportRegistry;
}
Channel::shared_pointer ServerContextImpl::getChannel(pvAccessID id)
Channel::shared_pointer ServerContextImpl::getChannel(pvAccessID /*id*/)
{
// not used
return Channel::shared_pointer();

4
pvAccessApp/utils/logger.cpp
View File

@@ -87,11 +87,11 @@ namespace epics {
static FileLogger* fileLogger = NULL;
static void errLogFileListener(void* pPrivate, const char *message) {
static void errLogFileListener(void* /*pPrivate*/, const char *message) {
fileLogger->logMessage(message);
}
static void exitFileLoggerHandler(void* pPrivate) {
static void exitFileLoggerHandler(void* /*pPrivate*/) {
errlogFlush();
delete fileLogger;
}

2
pvAccessApp/utils/referenceCountingLock.cpp
View File

@@ -44,7 +44,7 @@ ReferenceCountingLock::~ReferenceCountingLock()
// pthread_mutex_destroy(_mutex);
}
bool ReferenceCountingLock::acquire(int64 msecs)
bool ReferenceCountingLock::acquire(int64 /*msecs*/)
{
_mutex.lock();
return true;

2
testApp/client/testCreateRequest.cpp
View File

@@ -126,7 +126,7 @@ void testCreateRequest() {
assert(pvRequest.get()==NULL);
}
int main(int argc,char *argv[])
int main()
{
testCreateRequest();

2
testApp/client/testStartStop.cpp
View File

@@ -1,7 +1,7 @@
#include <iostream>
#include <pv/clientFactory.h>
int main(int argc, char *argv[]) {
int main() {
std::cout << "to start pvAccess ClientFactory" << std::endl;
::epics::pvAccess::ClientFactory::start();
std::cout << "do nothing after starting pvAccess ClientFactory" << std::endl;

8
testApp/remote/pvget.cpp
View File

@@ -80,7 +80,7 @@ void convertStructure(StringBuilder buffer,PVStructure *data,int notFirst)
}
}
void convertArray(StringBuilder buffer,PVScalarArray *pv,int notFirst)
void convertArray(StringBuilder buffer,PVScalarArray *pv,int /*notFirst*/)
{
// array stringification
std::stringstream sstream;
@@ -274,7 +274,7 @@ class MonitorRequesterImpl : public MonitorRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
}
virtual void monitorConnect(const epics::pvData::Status& status, Monitor::shared_pointer const & monitor, StructureConstPtr const & structure)
virtual void monitorConnect(const epics::pvData::Status& status, Monitor::shared_pointer const & monitor, StructureConstPtr const & /*structure*/)
{
if (status.isSuccess())
{
@@ -334,7 +334,7 @@ class MonitorRequesterImpl : public MonitorRequester
}
virtual void unlisten(Monitor::shared_pointer const & monitor)
virtual void unlisten(Monitor::shared_pointer const & /*monitor*/)
{
std::cout << "unlisten" << std::endl;
}
@@ -374,7 +374,7 @@ public:
}
}
virtual void channelStateChange(Channel::shared_pointer const & channel, Channel::ConnectionState connectionState)
virtual void channelStateChange(Channel::shared_pointer const & /*channel*/, Channel::ConnectionState connectionState)
{
if (connectionState == Channel::CONNECTED)
{

15
testApp/remote/pvput.cpp
View File

@@ -135,7 +135,7 @@ void convertStructure(StringBuilder buffer,PVStructure *data,int notFirst)
}
}
void convertArray(StringBuilder buffer,PVScalarArray * pv,int notFirst)
void convertArray(StringBuilder buffer,PVScalarArray * pv,int /*notFirst*/)
{
ScalarArrayConstPtr array = pv->getScalarArray();
ScalarType type = array->getElementType();
@@ -509,7 +509,7 @@ public:
}
}
virtual void channelStateChange(Channel::shared_pointer const & channel, Channel::ConnectionState connectionState)
virtual void channelStateChange(Channel::shared_pointer const & /*channel*/, Channel::ConnectionState connectionState)
{
if (connectionState == Channel::CONNECTED)
{
@@ -641,14 +641,21 @@ int main (int argc, char *argv[])
allOK &= putRequesterImpl->waitUntilDone(timeOut);
if (allOK)
{
getConvert()->fromString(putRequesterImpl->getStructure(), values);
// convert value from string
// since we access structure from another thread, we need to lock
{
ScopedLock lock(channelPut);
getConvert()->fromString(putRequesterImpl->getStructure(), values);
}
// we do a put
putRequesterImpl->resetEvent();
channelPut->put(false);
allOK &= putRequesterImpl->waitUntilDone(timeOut);
if (allOK)
{
// and than a get again to verify put
std::cout << "New : " << std::endl;
putRequesterImpl->resetEvent();
channelPut->get();

8
testApp/remote/pvrpc.cpp
View File

@@ -64,17 +64,17 @@ class ChannelRPCRequesterImpl : public ChannelRPCRequester
auto_ptr<Event> m_event;
public:
shared_ptr<epics::pvData::PVStructure> pvResponse;
ChannelRPCRequesterImpl(String channelName)
ChannelRPCRequesterImpl(String /*channelName*/)
{
resetEvent();
}
virtual void channelRPCConnect (const epics::pvData::Status &status, ChannelRPC::shared_pointer const &channelRPC)
virtual void channelRPCConnect (epics::pvData::Status const & /*status*/, ChannelRPC::shared_pointer const & /*channelRPC*/)
{
m_event->signal();
}
virtual void requestDone (const epics::pvData::Status &status, epics::pvData::PVStructure::shared_pointer const &pvResponse)
virtual void requestDone (epics::pvData::Status const & /*status*/, epics::pvData::PVStructure::shared_pointer const & pvResponse)
{
this->pvResponse = pvResponse;
m_event->signal();
@@ -134,7 +134,7 @@ public:
}
}
virtual void channelStateChange(Channel::shared_pointer const & channel, Channel::ConnectionState connectionState)
virtual void channelStateChange(Channel::shared_pointer const & /*channel*/, Channel::ConnectionState connectionState)
{
if (connectionState == Channel::CONNECTED)
{

10
testApp/remote/testBlockingTCPClnt.cpp
View File

@@ -72,9 +72,9 @@ public:
ResponseHandler() {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer const & transport, int8 version, int8 command, std::size_t payloadSize,
ByteBuffer* payloadBuffer) {
virtual void handleResponse(osiSockAddr* /*responseFrom*/,
Transport::shared_pointer const & transport, int8 /*version*/, int8 command, std::size_t /*payloadSize*/,
ByteBuffer* /*payloadBuffer*/) {
if(command==CMD_CONNECTION_VALIDATION) transport->verified();
}
@@ -89,7 +89,7 @@ public:
virtual void transportUnresponsive() {
LOG(logLevelInfo, "unresponsive");
}
virtual void transportResponsive(Transport::shared_pointer const & transport) {
virtual void transportResponsive(Transport::shared_pointer const & /*transport*/) {
LOG(logLevelInfo, "responsive");
}
virtual void transportChanged() {
@@ -170,7 +170,7 @@ void testBlockingTCPSender() {
}
int main(int argc, char *argv[]) {
int main() {
createFileLogger("testBlockingTCPClnt.log");
testBlockingTCPSender();

8
testApp/remote/testBlockingTCPSrv.cpp
View File

@@ -39,9 +39,9 @@ private:
class DummyResponseHandler : public ResponseHandler {
public:
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer const & transport, int8 version, int8 command, std::size_t payloadSize,
ByteBuffer* payloadBuffer) {
virtual void handleResponse(osiSockAddr* /*responseFrom*/,
Transport::shared_pointer const & /*transport*/, int8 /*version*/, int8 /*command*/, std::size_t /*payloadSize*/,
ByteBuffer* /*payloadBuffer*/) {
cout << "DummyResponseHandler::handleResponse" << endl;
}
};
@@ -65,7 +65,7 @@ void testServerConnections() {
delete srv;
}
int main(int argc, char *argv[]) {
int main() {
createFileLogger("testBlockingTCPSrv.log");

10
testApp/remote/testBlockingUDPClnt.cpp
View File

@@ -55,14 +55,14 @@ public:
class DummyResponseHandler : public ResponseHandler {
public:
DummyResponseHandler(Context* ctx)
DummyResponseHandler(Context* /*ctx*/)
{ }
virtual ~DummyResponseHandler() {}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer const &, int8 version, int8 command, std::size_t payloadSize,
ByteBuffer* payloadBuffer) {
virtual void handleResponse(osiSockAddr* /*responseFrom*/,
Transport::shared_pointer const & /*transport*/, int8 /*version*/, int8 /*command*/, std::size_t /*payloadSize*/,
ByteBuffer* /*payloadBuffer*/) {
}
};
@@ -133,7 +133,7 @@ void testBlockingUDPSender() {
}
}
int main(int argc, char *argv[]) {
int main() {
// createFileLogger("testBlockingUDPClnt.log");
testBlockingUDPSender();

4
testApp/remote/testBlockingUDPSrv.cpp
View File

@@ -49,7 +49,7 @@ public:
class DummyResponseHandler : public ResponseHandler {
public:
DummyResponseHandler(Context* context)
DummyResponseHandler(Context* /*context*/)
: packets(0) {
}
@@ -123,7 +123,7 @@ void testBlockingUDPConnector() {
}
}
int main(int argc, char *argv[]) {
int main() {
// createFileLogger("testBlockingUDPSrv.log");
testBlockingUDPConnector();

2
testApp/remote/testChannelConnect.cpp
View File

@@ -66,7 +66,7 @@ private:
int main(int argc,char *argv[])
int main()
{
{
Event g_event;

2
testApp/remote/testGetPerformance.cpp
View File

@@ -241,7 +241,7 @@ public:
}
}
virtual void channelStateChange(Channel::shared_pointer const &channel, Channel::ConnectionState connectionState)
virtual void channelStateChange(Channel::shared_pointer const & /*channel*/, Channel::ConnectionState connectionState)
{
if (connectionState == Channel::CONNECTED)
{

34
testApp/remote/testRemoteClientImpl.cpp
View File

@@ -15,7 +15,9 @@ using namespace epics::pvAccess;
class ChannelFindRequesterImpl : public ChannelFindRequester
{
virtual void channelFindResult(const epics::pvData::Status& status,ChannelFind::shared_pointer const & 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;
@@ -93,8 +95,9 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
}
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)
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())
@@ -143,8 +146,9 @@ class ChannelPutRequesterImpl : public ChannelPutRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
}
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)
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;
@@ -199,8 +203,9 @@ class ChannelPutGetRequesterImpl : public ChannelPutGetRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
}
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)
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;
@@ -277,7 +282,8 @@ class ChannelRPCRequesterImpl : public ChannelRPCRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
}
virtual void channelRPCConnect(const epics::pvData::Status& status,ChannelRPC::shared_pointer const & channelRPC)
virtual void channelRPCConnect(const epics::pvData::Status& status,
ChannelRPC::shared_pointer const & /*channelRPC*/)
{
std::cout << "channelRPCConnect(" << status.toString() << ")" << std::endl;
@@ -316,7 +322,7 @@ class ChannelArrayRequesterImpl : public ChannelArrayRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
}
virtual void channelArrayConnect(const epics::pvData::Status& status,ChannelArray::shared_pointer const & channelArray,
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;
@@ -366,7 +372,8 @@ class MonitorRequesterImpl : public MonitorRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
}
virtual void monitorConnect(const epics::pvData::Status& status, Monitor::shared_pointer const & monitor, StructureConstPtr const & 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)
@@ -394,7 +401,7 @@ class MonitorRequesterImpl : public MonitorRequester
monitor->release(element);
}
virtual void unlisten(Monitor::shared_pointer const & monitor)
virtual void unlisten(Monitor::shared_pointer const & /*monitor*/)
{
std::cout << "unlisten" << std::endl;
}
@@ -415,7 +422,8 @@ class ChannelProcessRequesterImpl : public ChannelProcessRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
}
virtual void channelProcessConnect(const epics::pvData::Status& status,ChannelProcess::shared_pointer const & channelProcess)
virtual void channelProcessConnect(const epics::pvData::Status& status,
ChannelProcess::shared_pointer const & /*channelProcess*/)
{
std::cout << "channelProcessConnect(" << status.toString() << ")" << std::endl;
@@ -430,7 +438,7 @@ class ChannelProcessRequesterImpl : public ChannelProcessRequester
};
int main(int argc,char *argv[])
int main()
{
for (int i = 0; i < 10; i++) {
{

59
testApp/remote/testServer.cpp
View File

@@ -30,7 +30,8 @@ class MockChannelProcess :
PVScalarPtr m_valueField;
protected:
MockChannelProcess(ChannelProcessRequester::shared_pointer const & channelProcessRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest) :
MockChannelProcess(ChannelProcessRequester::shared_pointer const & channelProcessRequester,
PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & /*pvRequest*/) :
m_channelProcessRequester(channelProcessRequester), m_pvStructure(pvStructure)
{
PVACCESS_REFCOUNT_MONITOR_CONSTRUCT(mockChannelProcess);
@@ -185,7 +186,8 @@ class MockChannelGet : public ChannelGet
bool m_first;
protected:
MockChannelGet(ChannelGetRequester::shared_pointer const & channelGetRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & 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)
{
@@ -248,7 +250,8 @@ class MockChannelPut : public ChannelPut
BitSet::shared_pointer m_bitSet;
protected:
MockChannelPut(ChannelPutRequester::shared_pointer const & channelPutRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & 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()))
{
@@ -310,7 +313,8 @@ class MockChannelPutGet : public ChannelPutGet
PVStructure::shared_pointer m_pvStructure;
protected:
MockChannelPutGet(ChannelPutGetRequester::shared_pointer const & channelPutGetRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest) :
MockChannelPutGet(ChannelPutGetRequester::shared_pointer const & channelPutGetRequester,
PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & /*pvRequest*/) :
m_channelPutGetRequester(channelPutGetRequester), m_pvStructure(pvStructure)
{
PVACCESS_REFCOUNT_MONITOR_CONSTRUCT(mockChannelPutGet);
@@ -378,7 +382,9 @@ class MockChannelRPC : public ChannelRPC
PVStructure::shared_pointer m_pvStructure;
protected:
MockChannelRPC(ChannelRPCRequester::shared_pointer const & channelRPCRequester, String const & channelName, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest) :
MockChannelRPC(ChannelRPCRequester::shared_pointer const & channelRPCRequester,
String const & channelName, PVStructure::shared_pointer const & pvStructure,
PVStructure::shared_pointer const & /*pvRequest*/) :
m_channelRPCRequester(channelRPCRequester), m_channelName(channelName), m_pvStructure(pvStructure)
{
PVACCESS_REFCOUNT_MONITOR_CONSTRUCT(mockChannelRPC);
@@ -556,7 +562,8 @@ class MockChannelArray : public ChannelArray
PVArray::shared_pointer m_pvArray;
protected:
MockChannelArray(ChannelArrayRequester::shared_pointer const & channelArrayRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest) :
MockChannelArray(ChannelArrayRequester::shared_pointer const & channelArrayRequester,
PVStructure::shared_pointer const & /*pvStructure*/, PVStructure::shared_pointer const & /*pvRequest*/) :
m_channelArrayRequester(channelArrayRequester),
m_pvArray(getPVDataCreate()->createPVScalarArray(pvDouble))
{
@@ -579,7 +586,7 @@ class MockChannelArray : public ChannelArray
PVACCESS_REFCOUNT_MONITOR_DESTRUCT(mockChannelArray);
}
virtual void putArray(bool lastRequest, int offset, int count)
virtual void putArray(bool lastRequest, int /*offset*/, int /*count*/)
{
// TODO offset, count
m_channelArrayRequester->putArrayDone(Status::Ok);
@@ -587,7 +594,7 @@ class MockChannelArray : public ChannelArray
destroy();
}
virtual void getArray(bool lastRequest, int offset, int count)
virtual void getArray(bool lastRequest, int /*offset*/, int /*count*/)
{
// TODO offset, count
m_channelArrayRequester->getArrayDone(Status::Ok);
@@ -595,7 +602,7 @@ class MockChannelArray : public ChannelArray
destroy();
}
virtual void setLength(bool lastRequest, int length, int capacity)
virtual void setLength(bool lastRequest, int /*length*/, int /*capacity*/)
{
// TODO offset, capacity
m_channelArrayRequester->setLengthDone(Status::Ok);
@@ -640,7 +647,8 @@ class MockMonitor : public Monitor, public MonitorElement, public std::tr1::enab
MonitorElement::shared_pointer m_nullMonitor;
protected:
MockMonitor(MonitorRequester::shared_pointer const & monitorRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & 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())),
@@ -699,7 +707,7 @@ class MockMonitor : public Monitor, public MonitorElement, public std::tr1::enab
}
}
virtual void release(MonitorElement::shared_pointer const & monitorElement)
virtual void release(MonitorElement::shared_pointer const & /*monitorElement*/)
{
Lock xx(m_lock);
if (m_count)
@@ -946,7 +954,7 @@ class MockChannel : public Channel {
return getConnectionState() == CONNECTED;
}
virtual AccessRights getAccessRights(epics::pvData::PVField::shared_pointer const & pvField)
virtual AccessRights getAccessRights(epics::pvData::PVField::shared_pointer const & /*pvField*/)
{
return readWrite;
}
@@ -1106,7 +1114,7 @@ class MockServerChannelProvider : public ChannelProvider,
}
virtual ChannelFind::shared_pointer channelFind(
epics::pvData::String const & channelName,
epics::pvData::String const & /*channelName*/,
ChannelFindRequester::shared_pointer const & channelFindRequester)
{
// channel always exists
@@ -1125,7 +1133,7 @@ class MockServerChannelProvider : public ChannelProvider,
virtual Channel::shared_pointer createChannel(
epics::pvData::String const & channelName,
ChannelRequester::shared_pointer const & channelRequester,
short priority,
short /*priority*/,
epics::pvData::String const & address)
{
if (address == "local")
@@ -1151,7 +1159,8 @@ class MockServerChannelProvider : public ChannelProvider,
class ChannelFindRequesterImpl : public ChannelFindRequester
{
virtual void channelFindResult(const epics::pvData::Status& status,ChannelFind::shared_pointer &channelFind,bool wasFound)
virtual void channelFindResult(epics::pvData::Status const & status,
ChannelFind::shared_pointer const & /*channelFind*/, bool wasFound)
{
std::cout << "[ChannelFindRequesterImpl] channelFindResult("
<< status.toString() << ", ..., " << wasFound << ")" << std::endl;
@@ -1225,8 +1234,10 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
}
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)
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;
@@ -1261,8 +1272,10 @@ class ChannelPutRequesterImpl : public ChannelPutRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
}
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)
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;
@@ -1304,7 +1317,8 @@ class MonitorRequesterImpl : public MonitorRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
}
virtual void monitorConnect(const Status& status, Monitor::shared_pointer const & 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)
@@ -1332,7 +1346,7 @@ class MonitorRequesterImpl : public MonitorRequester
monitor->release(element);
}
virtual void unlisten(Monitor::shared_pointer const & monitor)
virtual void unlisten(Monitor::shared_pointer const & /*monitor*/)
{
std::cout << "unlisten" << std::endl;
}
@@ -1353,7 +1367,8 @@ class ChannelProcessRequesterImpl : public ChannelProcessRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
}
virtual void channelProcessConnect(const epics::pvData::Status& status,ChannelProcess::shared_pointer const & channelProcess)
virtual void channelProcessConnect(const epics::pvData::Status& status,
ChannelProcess::shared_pointer const & /*channelProcess*/)
{
std::cout << "channelProcessConnect(" << status.toString() << ")" << std::endl;

8
testApp/remote/testServerContext.cpp
View File

@@ -16,7 +16,7 @@ public:
epics::pvData::String getProviderName() { return "local"; };
ChannelFind::shared_pointer channelFind(epics::pvData::String const & channelName,
ChannelFind::shared_pointer channelFind(epics::pvData::String const & /*channelName*/,
ChannelFindRequester::shared_pointer const & channelFindRequester)
{
ChannelFind::shared_pointer nullCF;
@@ -33,9 +33,9 @@ public:
}
Channel::shared_pointer createChannel(
epics::pvData::String const & channelName,
epics::pvData::String const & /*channelName*/,
ChannelRequester::shared_pointer const & channelRequester,
short priority, epics::pvData::String const & address)
short /*priority*/, epics::pvData::String const & /*address*/)
{
Channel::shared_pointer nullC;
channelRequester->channelCreated(Status::Ok, nullC);
@@ -86,7 +86,7 @@ void testServerContext()
ctx->destroy();
}
int main(int argc, char *argv[])
int main()
{
testServerContext();