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

some more handlers

Browse Source
This commit is contained in:
Gasper Jansa
2011-02-18 17:37:56 +01:00
parent 5af10bb7b6
commit 1494fd2637
2 changed files with 241 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

215
pvAccessApp/server/responseHandlers.cpp
View File

@@ -41,7 +41,7 @@ namespace epics {
ServerResponseHandler::ServerResponseHandler(ServerContextImpl* context) {
BadResponse* badResponse = new BadResponse(context);
_badResponse = new BadResponse(context);
_handlerTable = new ResponseHandler*[HANDLER_TABLE_LENGTH];
// TODO add real handlers, as they are developed
@@ -49,33 +49,34 @@ namespace epics {
_handlerTable[1] = new ConnectionValidationHandler(context);
_handlerTable[2] = new EchoHandler(context);
_handlerTable[3] = new SearchHandler(context);
_handlerTable[4] = badResponse;
_handlerTable[4] = _badResponse;
_handlerTable[5] = new IntrospectionSearchHandler(context);
_handlerTable[6] = badResponse;
_handlerTable[6] = _badResponse;
_handlerTable[7] = new CreateChannelHandler(context);
_handlerTable[8] = new DestroyChannelHandler(context);
_handlerTable[9] = badResponse;
_handlerTable[10] = badResponse;
_handlerTable[11] = badResponse;
_handlerTable[12] = badResponse;
_handlerTable[13] = badResponse;
_handlerTable[14] = badResponse;
_handlerTable[15] = badResponse;
_handlerTable[16] = badResponse;
_handlerTable[17] = badResponse;
_handlerTable[18] = badResponse;
_handlerTable[19] = badResponse;
_handlerTable[20] = badResponse;
_handlerTable[21] = badResponse;
_handlerTable[22] = badResponse;
_handlerTable[23] = badResponse;
_handlerTable[24] = badResponse;
_handlerTable[25] = badResponse;
_handlerTable[26] = badResponse;
_handlerTable[27] = badResponse;
_handlerTable[9] = _badResponse;
//_handlerTable[10] = new GetHandler(context);
_handlerTable[11] = _badResponse;
_handlerTable[12] = _badResponse;
_handlerTable[13] = _badResponse;
_handlerTable[14] = _badResponse;
_handlerTable[15] = _badResponse;
_handlerTable[16] = _badResponse;
_handlerTable[17] = _badResponse;
_handlerTable[18] = _badResponse;
_handlerTable[19] = _badResponse;
_handlerTable[20] = _badResponse;
_handlerTable[21] = _badResponse;
_handlerTable[22] = _badResponse;
_handlerTable[23] = _badResponse;
_handlerTable[24] = _badResponse;
_handlerTable[25] = _badResponse;
_handlerTable[26] = _badResponse;
_handlerTable[27] = _badResponse;
}
ServerResponseHandler::~ServerResponseHandler() {
delete _badResponse;
delete _handlerTable[0];
delete _handlerTable[1];
delete _handlerTable[2];
@@ -83,6 +84,7 @@ namespace epics {
delete _handlerTable[5];
delete _handlerTable[7];
delete _handlerTable[8];
delete _handlerTable[10];
delete _handlerTable[27];
delete[] _handlerTable;
}
@@ -329,7 +331,7 @@ namespace epics {
}
void ChannelRequesterImpl::channelCreated(const Status& status, Channel* const channel)
void ChannelRequesterImpl::channelCreated(const Status& status, Channel* channel)
{
Lock guard(_mutex);
_status = status;
@@ -337,7 +339,7 @@ namespace epics {
_transport->enqueueSendRequest(this);
}
void ChannelRequesterImpl::channelStateChange(Channel* constc, const Channel::ConnectionState isConnected)
void ChannelRequesterImpl::channelStateChange(Channel* c, const Channel::ConnectionState isConnected)
{
//noop
}
@@ -481,7 +483,170 @@ namespace epics {
casTransport->unregisterChannel(sid);
// send response back
transport->enqueueSendRequest( new DestroyChannelHandlerTransportSender(cid, sid));
transport->enqueueSendRequest(new DestroyChannelHandlerTransportSender(cid, sid));
}
/****************************************************************************************/
void GetHandler::handleResponse(osiSockAddr* responseFrom,
Transport* transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer) {
AbstractServerResponseHandler::handleResponse(responseFrom,
transport, version, command, payloadSize, payloadBuffer);
// NOTE: we do not explicitly check if transport is OK
ChannelHostingTransport* casTransport = dynamic_cast<ChannelHostingTransport*>(transport);
transport->ensureData(2*sizeof(int32)/sizeof(int8)+1);
const pvAccessID sid = payloadBuffer->getInt();
const pvAccessID ioid = payloadBuffer->getInt();
// mode
const int8 qosCode = payloadBuffer->getByte();
ServerChannelImpl* channel = static_cast<ServerChannelImpl*>(casTransport->getChannel(sid));
if (channel == NULL)
{
BaseChannelRequester::sendFailureMessage((int8)10, transport, ioid, qosCode, BaseChannelRequester::badCIDStatus);
return;
}
const boolean init = (QOS_INIT & qosCode) != 0;
if (init)
{
// pvRequest
PVStructurePtr pvRequest = transport->getIntrospectionRegistry()->deserializePVRequest(payloadBuffer, transport);
// create...
// new ChannelGetRequesterImpl(_context, channel, ioid, transport, pvRequest);
}
/* else
{
final boolean lastRequest = QoS.DESTROY.isSet(qosCode);
ChannelGetRequesterImpl request = (ChannelGetRequesterImpl)channel.getRequest(ioid);
if (request == null) {
BaseChannelRequester.sendFailureMessage((byte)10, transport, ioid, qosCode, BaseChannelRequester.badIOIDStatus);
return;
}
if (!request.startRequest(qosCode)) {
BaseChannelRequester.sendFailureMessage((byte)10, transport, ioid, qosCode, BaseChannelRequester.otherRequestPendingStatus);
return;
}
/*
// check read access rights
if (!AccessRights.READ.isSet(channel.getAccessRights()))
{
getFailureResponse(transport, ioid, qosCode, BaseChannelRequester.noReadACLStatus);
if (lastRequest)
request.destroy();
return;
}
*/
// request.getChannelGet().get(lastRequest);
// }
}
ChannelGetRequesterImpl::ChannelGetRequesterImpl(ServerContextImpl* context, ServerChannelImpl* channel, const pvAccessID ioid, Transport* transport,
epics::pvData::PVStructurePtr pvRequest) :
BaseChannelRequester(context, channel, ioid, transport)
{
startRequest(QOS_INIT);
channel->registerRequest(ioid, this);
_channelGet = channel->getChannel()->createChannelGet(this, pvRequest);
// TODO what if last call fails... registration is still present
}
void ChannelGetRequesterImpl::channelGetConnect(const epics::pvData::Status& status, ChannelGet* channelGet, epics::pvData::PVStructurePtr pvStructure,
epics::pvData::BitSet* bitSet)
{
{
Lock guard(&_mutex);
_bitSet = bitSet;
_pvStructure = pvStructure;
_status = status;
_channelGet = channelGet;
}
_transport->enqueueSendRequest(this);
// self-destruction
if (!status.isSuccess())
{
destroy();
}
}
void ChannelGetRequesterImpl::getDone(const epics::pvData::Status& status)
{
{
Lock guard(&_mutex);
_status = status;
}
_transport->enqueueSendRequest(this);
}
void ChannelGetRequesterImpl::destroy()
{
_channel->unregisterRequest(_ioid);
if (_channelGet != NULL)
{
_channelGet->destroy();
}
}
ChannelGet* ChannelGetRequesterImpl::getChannelGet()
{
return _channelGet;
}
void ChannelGetRequesterImpl::lock()
{
//TODO
}
void ChannelGetRequesterImpl::unlock()
{
//TODO
}
void ChannelGetRequesterImpl::send(ByteBuffer* buffer, TransportSendControl* control)
{
const int32 request = getPendingRequest();
control->startMessage((int8)10, sizeof(int32)/sizeof(int8) + 1);
buffer->putInt(_ioid);
buffer->put((int8)request);
IntrospectionRegistry* introspectionRegistry = _transport->getIntrospectionRegistry();
{
Lock guard(&_mutex);
introspectionRegistry->serializeStatus(buffer, control, _status);
}
if (_status.isSuccess())
{
if (request & QOS_INIT)
{
Lock guard(&_mutex);
introspectionRegistry->serialize(_pvStructure != NULL ? _pvStructure->getField() : NULL, buffer, control);
}
else
{
_bitSet->serialize(buffer, control);
_pvStructure->serialize(buffer, control, _bitSet);
}
}
stopRequest();
// lastRequest
if (request & QOS_DESTROY)
{
destroy();
}
}
}
}

54
pvAccessApp/server/responseHandlers.h
View File

@@ -11,6 +11,7 @@
#include "serverContext.h"
#include "remote.h"
#include "serverChannelImpl.h"
#include "baseChannelRequester.h"
namespace epics {
namespace pvAccess {
@@ -73,6 +74,10 @@ namespace epics {
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
private:
static const int HANDLER_TABLE_LENGTH = 28;
/**
* Bad response handlers.
*/
BadResponse *_badResponse;
/**
* Table of response handlers for each command ID.
*/
@@ -226,6 +231,7 @@ namespace epics {
AbstractServerResponseHandler(context, "Create channel request") {
}
//TODO where is implementation???
virtual void handleResponse(osiSockAddr* responseFrom,
Transport* transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
@@ -237,9 +243,9 @@ namespace epics {
class ChannelRequesterImpl : public ChannelRequester, public TransportSender
{
public:
ChannelRequesterImpl(Transport* transport, const String channelName, const int32 cid);
void channelCreated(const Status& status, Channel* const channel);
void channelStateChange(Channel* const c, const Channel::ConnectionState isConnected);
ChannelRequesterImpl(Transport* transport, const String channelName, const pvAccessID cid);
void channelCreated(const Status& status, Channel* channel);
void channelStateChange(Channel* c, const Channel::ConnectionState isConnected);
String getRequesterName();
void message(const String message, const epics::pvData::MessageType messageType);
void lock();
@@ -310,6 +316,48 @@ namespace epics {
pvAccessID _sid;
};
/****************************************************************************************/
/**
* Get request handler.
*/
class GetHandler : public AbstractServerResponseHandler
{
public:
/**
* @param context
*/
GetHandler(ServerContextImpl* context) :
AbstractServerResponseHandler(context, "Get request") {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport* transport, int8 version, int8 command,
int payloadSize, epics::pvData::ByteBuffer* payloadBuffer);
};
class ChannelGetRequesterImpl : private BaseChannelRequester, public ChannelGetRequester, public TransportSender
{
public:
ChannelGetRequesterImpl(ServerContextImpl* context, ServerChannelImpl* channel, const pvAccessID ioid, Transport* transport,
epics::pvData::PVStructurePtr pvRequest);
void channelGetConnect(const epics::pvData::Status& status, ChannelGet* channelGet, epics::pvData::PVStructurePtr pvStructure,
epics::pvData::BitSet* bitSet);
void getDone(const epics::pvData::Status& status);
void destroy();
/**
* @return the channelGet
*/
ChannelGet* getChannelGet();
void lock();
void unlock();
void send(ByteBuffer* buffer, TransportSendControl* control);
private:
ChannelGet* _channelGet;
epics::pvData::BitSet* _bitSet;
epics::pvData::PVStructurePtr _pvStructure;
epics::pvData::Status _status;
epics::pvData::Mutex _mutex;
};
}
}