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

remove no-op lock/unlock from Lock sub-classes

Browse Source
This commit is contained in:
Michael Davidsaver
2017-05-24 17:20:17 -04:00
parent bbe6cb2553
commit b05e7699b5
14 changed files with 0 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/baseChannelRequester.cpp
-20
View File
@@ -100,16 +100,6 @@ void BaseChannelRequesterMessageTransportSender::send(ByteBuffer* buffer, Transp
epics::pvData::SerializeHelper::serializeString(_message, buffer, control);
}
void BaseChannelRequesterMessageTransportSender::lock()
{
// noop
}
void BaseChannelRequesterMessageTransportSender::unlock()
{
// noop
}
BaseChannelRequesterFailureMessageTransportSender::BaseChannelRequesterFailureMessageTransportSender(const int8 command,
Transport::shared_pointer const & transport, const pvAccessID ioid, const int8 qos, const Status& status) :
_command(command),
@@ -128,16 +118,6 @@ void BaseChannelRequesterFailureMessageTransportSender::send(ByteBuffer* buffer,
_status.serialize(buffer, control);
}
void BaseChannelRequesterFailureMessageTransportSender::lock()
{
// noop
}
void BaseChannelRequesterFailureMessageTransportSender::unlock()
{
// noop
}
}
}
src/server/beaconEmitter.cpp
-10
View File
@@ -49,16 +49,6 @@ BeaconEmitter::~BeaconEmitter()
// destroy();
}
void BeaconEmitter::lock()
{
//noop
}
void BeaconEmitter::unlock()
{
//noop
}
void BeaconEmitter::send(ByteBuffer* buffer, TransportSendControl* control)
{
// get server status
src/server/pv/baseChannelRequester.h
-4
View File
@@ -65,8 +65,6 @@ class BaseChannelRequesterMessageTransportSender : public TransportSender
public:
BaseChannelRequesterMessageTransportSender(const pvAccessID _ioid, const std::string message,const epics::pvData::MessageType messageType);
void send(epics::pvData::ByteBuffer* buffer, TransportSendControl* control);
void lock();
void unlock();
private:
const pvAccessID _ioid;
const std::string _message;
@@ -78,8 +76,6 @@ class BaseChannelRequesterFailureMessageTransportSender : public TransportSender
public:
BaseChannelRequesterFailureMessageTransportSender(const epics::pvData::int8 command, Transport::shared_pointer const & transport, const pvAccessID ioid, const epics::pvData::int8 qos, const epics::pvData::Status& status);
void send(epics::pvData::ByteBuffer* buffer, TransportSendControl* control);
void lock();
void unlock();
private:
const epics::pvData::int8 _command;
src/server/pv/beaconEmitter.h
-3
View File
@@ -59,9 +59,6 @@ public:
virtual ~BeaconEmitter();
void lock();
void unlock();
void send(epics::pvData::ByteBuffer* buffer, TransportSendControl* control);
void timerStopped();
src/server/pv/responseHandlers.h
-42
View File
@@ -125,12 +125,6 @@ public:
// TODO content
}
virtual void lock() {
}
virtual void unlock() {
}
private:
osiSockAddr _echoFrom;
};
@@ -174,8 +168,6 @@ public:
epics::pvData::int32 cid, osiSockAddr const & sendTo, bool responseRequired, bool serverSearch);
void channelFindResult(const epics::pvData::Status& status, ChannelFind::shared_pointer const & channelFind, bool wasFound);
void lock();
void unlock();
void send(epics::pvData::ByteBuffer* buffer, TransportSendControl* control);
void callback();
@@ -242,8 +234,6 @@ public:
void channelStateChange(Channel::shared_pointer const & c, const Channel::ConnectionState isConnected);
std::string getRequesterName();
void message(std::string const & message, epics::pvData::MessageType messageType);
void lock();
void unlock();
void send(epics::pvData::ByteBuffer* buffer, TransportSendControl* control);
private:
ServerChannel::weak_pointer _serverChannel;
@@ -286,14 +276,6 @@ public:
buffer->putInt(_cid);
}
void lock() {
// noop
}
void unlock() {
// noop
}
private:
pvAccessID _cid;
pvAccessID _sid;
@@ -345,8 +327,6 @@ public:
ChannelGet::shared_pointer getChannelGet();
void lock();
void unlock();
void send(epics::pvData::ByteBuffer* buffer, TransportSendControl* control);
private:
ChannelGet::shared_pointer _channelGet;
@@ -396,8 +376,6 @@ public:
void channelPutConnect(const epics::pvData::Status& status, ChannelPut::shared_pointer const & channelPut, epics::pvData::Structure::const_shared_pointer const & structure);
void putDone(const epics::pvData::Status& status, ChannelPut::shared_pointer const & channelPut);
void getDone(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 lock();
void unlock();
void destroy();
ChannelPut::shared_pointer getChannelPut();
@@ -460,8 +438,6 @@ public:
void putGetDone(const epics::pvData::Status& status, ChannelPutGet::shared_pointer const & channelPutGet,
epics::pvData::PVStructure::shared_pointer const & pvStructure,
epics::pvData::BitSet::shared_pointer const & bitSet);
void lock();
void unlock();
void destroy();
ChannelPutGet::shared_pointer getChannelPutGet();
@@ -521,8 +497,6 @@ public:
void monitorConnect(const epics::pvData::Status& status, Monitor::shared_pointer const & monitor, epics::pvData::StructureConstPtr const & structure);
void unlisten(Monitor::shared_pointer const & monitor);
void monitorEvent(Monitor::shared_pointer const & monitor);
void lock();
void unlock();
void destroy();
Monitor::shared_pointer getChannelMonitor();
@@ -579,8 +553,6 @@ public:
void setLengthDone(const epics::pvData::Status& status, ChannelArray::shared_pointer const & channelArray);
void getLengthDone(const epics::pvData::Status& status, ChannelArray::shared_pointer const & channelArray,
std::size_t length);
void lock();
void unlock();
void destroy();
ChannelArray::shared_pointer getChannelArray();
@@ -677,8 +649,6 @@ public:
void channelProcessConnect(const epics::pvData::Status& status, ChannelProcess::shared_pointer const & channelProcess);
void processDone(const epics::pvData::Status& status, ChannelProcess::shared_pointer const & channelProcess);
void lock();
void unlock();
void destroy();
ChannelProcess::shared_pointer getChannelProcess();
@@ -724,8 +694,6 @@ public:
virtual ~ServerGetFieldRequesterImpl() {}
void getDone(const epics::pvData::Status& status, epics::pvData::FieldConstPtr const & field);
void lock();
void unlock();
void destroy();
void send(epics::pvData::ByteBuffer* buffer, TransportSendControl* control);
private:
@@ -748,14 +716,6 @@ public:
_status.serialize(buffer, control);
}
void lock() {
// noop
}
void unlock() {
// noop
}
private:
const pvAccessID _ioid;
const epics::pvData::Status _status;
@@ -802,8 +762,6 @@ public:
void channelRPCConnect(const epics::pvData::Status& status, ChannelRPC::shared_pointer const & channelRPC);
void requestDone(const epics::pvData::Status& status, ChannelRPC::shared_pointer const & channelRPC, epics::pvData::PVStructure::shared_pointer const & pvResponse);
void lock();
void unlock();
void destroy();
/**
* @return the channelRPC
src/server/responseHandlers.cpp
-100
View File
@@ -426,16 +426,6 @@ void ServerChannelFindRequesterImpl::channelFindResult(const Status& /*status*/,
}
}
void ServerChannelFindRequesterImpl::lock()
{
// noop
}
void ServerChannelFindRequesterImpl::unlock()
{
// noop
}
void ServerChannelFindRequesterImpl::send(ByteBuffer* buffer, TransportSendControl* control)
{
control->startMessage((int8)4, 12+4+16+2);
@@ -906,16 +896,6 @@ void ServerChannelRequesterImpl::message(std::string const & message, MessageTyp
LOG(logLevelDebug, "[%s] %s", getMessageTypeName(messageType).c_str(), message.c_str());
}
void ServerChannelRequesterImpl::lock()
{
//noop
}
void ServerChannelRequesterImpl::unlock()
{
//noop
}
void ServerChannelRequesterImpl::send(ByteBuffer* buffer, TransportSendControl* control)
{
ServerChannel::shared_pointer serverChannel;
@@ -1201,16 +1181,6 @@ ChannelGet::shared_pointer ServerChannelGetRequesterImpl::getChannelGet()
return _channelGet;
}
void ServerChannelGetRequesterImpl::lock()
{
// noop
}
void ServerChannelGetRequesterImpl::unlock()
{
// noop
}
// TODO get rid of all these mutex-es
void ServerChannelGetRequesterImpl::send(ByteBuffer* buffer, TransportSendControl* control)
{
@@ -1452,16 +1422,6 @@ void ServerChannelPutRequesterImpl::getDone(const Status& status, ChannelPut::sh
_transport->enqueueSendRequest(thisSender);
}
void ServerChannelPutRequesterImpl::lock()
{
//noop
}
void ServerChannelPutRequesterImpl::unlock()
{
//noop
}
void ServerChannelPutRequesterImpl::destroy()
{
// keep a reference to ourselves as the owner
@@ -1772,16 +1732,6 @@ void ServerChannelPutGetRequesterImpl::putGetDone(const Status& status, ChannelP
_transport->enqueueSendRequest(thisSender);
}
void ServerChannelPutGetRequesterImpl::lock()
{
// noop
}
void ServerChannelPutGetRequesterImpl::unlock()
{
// noop
}
void ServerChannelPutGetRequesterImpl::destroy()
{
// keep a reference to ourselves as the owner
@@ -2075,16 +2025,6 @@ void ServerMonitorRequesterImpl::monitorEvent(Monitor::shared_pointer const & /*
_transport->enqueueSendRequest(thisSender);
}
void ServerMonitorRequesterImpl::lock()
{
//noop
}
void ServerMonitorRequesterImpl::unlock()
{
//noop
}
void ServerMonitorRequesterImpl::destroy()
{
// keep a reference to ourselves as the owner
@@ -2440,16 +2380,6 @@ void ServerChannelArrayRequesterImpl::getLengthDone(const Status& status, Channe
_transport->enqueueSendRequest(thisSender);
}
void ServerChannelArrayRequesterImpl::lock()
{
// noop
}
void ServerChannelArrayRequesterImpl::unlock()
{
// noop
}
void ServerChannelArrayRequesterImpl::destroy()
{
// keep a reference to ourselves as the owner
@@ -2749,16 +2679,6 @@ void ServerChannelProcessRequesterImpl::processDone(const Status& status, Channe
_transport->enqueueSendRequest(thisSender);
}
void ServerChannelProcessRequesterImpl::lock()
{
// noop
}
void ServerChannelProcessRequesterImpl::unlock()
{
// noop
}
void ServerChannelProcessRequesterImpl::destroy()
{
// keep a reference to ourselves as the owner
@@ -2874,16 +2794,6 @@ void ServerGetFieldRequesterImpl::getDone(const Status& status, FieldConstPtr co
_transport->enqueueSendRequest(thisSender);
}
void ServerGetFieldRequesterImpl::lock()
{
//noop
}
void ServerGetFieldRequesterImpl::unlock()
{
//noop
}
void ServerGetFieldRequesterImpl::destroy()
{
}
@@ -3041,16 +2951,6 @@ void ServerChannelRPCRequesterImpl::requestDone(const Status& status, ChannelRPC
_transport->enqueueSendRequest(thisSender);
}
void ServerChannelRPCRequesterImpl::lock()
{
// noop
}
void ServerChannelRPCRequesterImpl::unlock()
{
// noop
}
void ServerChannelRPCRequesterImpl::destroy()
{
// keep a reference to ourselves as the owner