cleanup and quiet warnings
This commit is contained in:
@ -133,7 +133,7 @@ struct Getter : public pvac::detail::CallbackStorage,
|
|||||||
callEvent(G, status.isSuccess()? pvac::GetEvent::Success : pvac::GetEvent::Fail);
|
callEvent(G, status.isSuccess()? pvac::GetEvent::Success : pvac::GetEvent::Fail);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void show(std::ostream &strm) const
|
virtual void show(std::ostream &strm) const OVERRIDE FINAL
|
||||||
{
|
{
|
||||||
strm << "Operation(Get"
|
strm << "Operation(Get"
|
||||||
"\"" << name() <<"\""
|
"\"" << name() <<"\""
|
||||||
|
@ -193,7 +193,7 @@ struct Putter : public pvac::detail::CallbackStorage,
|
|||||||
callEvent(G, status.isSuccess()? pvac::GetEvent::Success : pvac::GetEvent::Fail);
|
callEvent(G, status.isSuccess()? pvac::GetEvent::Success : pvac::GetEvent::Fail);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void show(std::ostream &strm) const
|
virtual void show(std::ostream &strm) const OVERRIDE FINAL
|
||||||
{
|
{
|
||||||
strm << "Operation(Put"
|
strm << "Operation(Put"
|
||||||
"\"" << name() <<"\""
|
"\"" << name() <<"\""
|
||||||
|
@ -140,7 +140,7 @@ struct RPCer : public pvac::detail::CallbackStorage,
|
|||||||
callEvent(G, status.isSuccess()? pvac::GetEvent::Success : pvac::GetEvent::Fail);
|
callEvent(G, status.isSuccess()? pvac::GetEvent::Success : pvac::GetEvent::Fail);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void show(std::ostream &strm) const
|
virtual void show(std::ostream &strm) const OVERRIDE FINAL
|
||||||
{
|
{
|
||||||
strm << "Operation(RPC"
|
strm << "Operation(RPC"
|
||||||
"\"" << name() <<"\""
|
"\"" << name() <<"\""
|
||||||
|
@ -18,7 +18,6 @@ namespace pvAccess {
|
|||||||
BeaconHandler::BeaconHandler(Context::shared_pointer const & context,
|
BeaconHandler::BeaconHandler(Context::shared_pointer const & context,
|
||||||
const osiSockAddr* responseFrom) :
|
const osiSockAddr* responseFrom) :
|
||||||
_context(Context::weak_pointer(context)),
|
_context(Context::weak_pointer(context)),
|
||||||
_responseFrom(*responseFrom),
|
|
||||||
_mutex(),
|
_mutex(),
|
||||||
_serverGUID(),
|
_serverGUID(),
|
||||||
_serverChangeCount(-1),
|
_serverChangeCount(-1),
|
||||||
@ -34,7 +33,7 @@ BeaconHandler::~BeaconHandler()
|
|||||||
void BeaconHandler::beaconNotify(osiSockAddr* /*from*/, int8 remoteTransportRevision,
|
void BeaconHandler::beaconNotify(osiSockAddr* /*from*/, int8 remoteTransportRevision,
|
||||||
TimeStamp* timestamp, ServerGUID const & guid, int16 sequentalID,
|
TimeStamp* timestamp, ServerGUID const & guid, int16 sequentalID,
|
||||||
int16 changeCount,
|
int16 changeCount,
|
||||||
PVFieldPtr /*data*/)
|
const PVFieldPtr& /*data*/)
|
||||||
{
|
{
|
||||||
bool networkChanged = updateBeacon(remoteTransportRevision, timestamp, guid, sequentalID, changeCount);
|
bool networkChanged = updateBeacon(remoteTransportRevision, timestamp, guid, sequentalID, changeCount);
|
||||||
// TODO: reduce search timers
|
// TODO: reduce search timers
|
||||||
|
@ -104,8 +104,7 @@ AbstractCodec::AbstractCodec(
|
|||||||
_lastMessageStartPosition(std::numeric_limits<size_t>::max()),_lastSegmentedMessageType(0),
|
_lastMessageStartPosition(std::numeric_limits<size_t>::max()),_lastSegmentedMessageType(0),
|
||||||
_lastSegmentedMessageCommand(0), _nextMessagePayloadOffset(0),
|
_lastSegmentedMessageCommand(0), _nextMessagePayloadOffset(0),
|
||||||
_byteOrderFlag(EPICS_BYTE_ORDER == EPICS_ENDIAN_BIG ? 0x80 : 0x00),
|
_byteOrderFlag(EPICS_BYTE_ORDER == EPICS_ENDIAN_BIG ? 0x80 : 0x00),
|
||||||
_clientServerFlag(serverFlag ? 0x40 : 0x00),
|
_clientServerFlag(serverFlag ? 0x40 : 0x00)
|
||||||
_socketSendBufferSize(socketSendBufferSize)
|
|
||||||
{
|
{
|
||||||
if (_socketBuffer.getSize() < 2*MAX_ENSURE_SIZE)
|
if (_socketBuffer.getSize() < 2*MAX_ENSURE_SIZE)
|
||||||
throw std::invalid_argument(
|
throw std::invalid_argument(
|
||||||
|
@ -60,7 +60,7 @@ public:
|
|||||||
ServerGUID const &guid,
|
ServerGUID const &guid,
|
||||||
epics::pvData::int16 sequentalID,
|
epics::pvData::int16 sequentalID,
|
||||||
epics::pvData::int16 changeCount,
|
epics::pvData::int16 changeCount,
|
||||||
epics::pvData::PVFieldPtr data);
|
const epics::pvData::PVFieldPtr& data);
|
||||||
private:
|
private:
|
||||||
/**
|
/**
|
||||||
* Context instance.
|
* Context instance.
|
||||||
@ -69,7 +69,6 @@ private:
|
|||||||
/**
|
/**
|
||||||
* Remote address.
|
* Remote address.
|
||||||
*/
|
*/
|
||||||
const osiSockAddr _responseFrom;
|
|
||||||
/**
|
/**
|
||||||
* Mutex
|
* Mutex
|
||||||
*/
|
*/
|
||||||
|
@ -284,7 +284,7 @@ protected:
|
|||||||
*/
|
*/
|
||||||
ResponseHandler::shared_pointer _responseHandler;
|
ResponseHandler::shared_pointer _responseHandler;
|
||||||
|
|
||||||
virtual void run();
|
virtual void run() OVERRIDE FINAL;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool processBuffer(Transport::shared_pointer const & transport, osiSockAddr& fromAddress, epics::pvData::ByteBuffer* receiveBuffer);
|
bool processBuffer(Transport::shared_pointer const & transport, osiSockAddr& fromAddress, epics::pvData::ByteBuffer* receiveBuffer);
|
||||||
|
@ -298,7 +298,6 @@ private:
|
|||||||
protected:
|
protected:
|
||||||
const epics::pvData::int8 _clientServerFlag;
|
const epics::pvData::int8 _clientServerFlag;
|
||||||
private:
|
private:
|
||||||
const size_t _socketSendBufferSize;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
mutable epics::pvData::Mutex _mutex;
|
mutable epics::pvData::Mutex _mutex;
|
||||||
|
@ -373,7 +373,7 @@ public:
|
|||||||
|
|
||||||
epics::pvData::BitSet::shared_pointer getPutBitSet();
|
epics::pvData::BitSet::shared_pointer getPutBitSet();
|
||||||
epics::pvData::PVStructure::shared_pointer getPutPVStructure();
|
epics::pvData::PVStructure::shared_pointer getPutPVStructure();
|
||||||
void send(epics::pvData::ByteBuffer* buffer, TransportSendControl* control);
|
void send(epics::pvData::ByteBuffer* buffer, TransportSendControl* control) OVERRIDE FINAL;
|
||||||
private:
|
private:
|
||||||
// Note: this forms a reference loop, which is broken in destroy()
|
// Note: this forms a reference loop, which is broken in destroy()
|
||||||
ChannelPut::shared_pointer _channelPut;
|
ChannelPut::shared_pointer _channelPut;
|
||||||
|
@ -120,7 +120,7 @@ StaticProvider::StaticProvider(const std::string &name)
|
|||||||
impl->internal_self = impl;
|
impl->internal_self = impl;
|
||||||
impl->finder = pva::ChannelFind::buildDummy(impl);
|
impl->finder = pva::ChannelFind::buildDummy(impl);
|
||||||
// wrap ref to call destroy when all external refs (from DyamicProvider::impl) are released.
|
// wrap ref to call destroy when all external refs (from DyamicProvider::impl) are released.
|
||||||
impl.reset(impl.get(), pvd::Destroyable::cleaner(impl));
|
impl.reset(impl.get(), pva::Destroyable::cleaner(impl));
|
||||||
impl->external_self = impl;
|
impl->external_self = impl;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -262,7 +262,7 @@ DynamicProvider::DynamicProvider(const std::string &name,
|
|||||||
impl->internal_self = impl;
|
impl->internal_self = impl;
|
||||||
impl->finder = pva::ChannelFind::buildDummy(impl);
|
impl->finder = pva::ChannelFind::buildDummy(impl);
|
||||||
// wrap ref to call destroy when all external refs (from DyamicProvider::impl) are released.
|
// wrap ref to call destroy when all external refs (from DyamicProvider::impl) are released.
|
||||||
impl.reset(impl.get(), pvd::Destroyable::cleaner(impl));
|
impl.reset(impl.get(), pva::Destroyable::cleaner(impl));
|
||||||
impl->external_self = impl;
|
impl->external_self = impl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -569,6 +569,7 @@ public:
|
|||||||
void waitGet(double timeout);
|
void waitGet(double timeout);
|
||||||
void waitPut(double timeout);
|
void waitPut(double timeout);
|
||||||
void stopEvents();
|
void stopEvents();
|
||||||
|
virtual ~TestClient() {}
|
||||||
private:
|
private:
|
||||||
TestClient(string const &channelName,PVStructurePtr const & pvRequest);
|
TestClient(string const &channelName,PVStructurePtr const & pvRequest);
|
||||||
string channelName;
|
string channelName;
|
||||||
|
Reference in New Issue
Block a user