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

Field serialization moved to pvData

Browse Source
This commit is contained in:
Matej Sekoranja
2012-03-27 12:02:23 +02:00
parent c7beef6719
commit 21774ff01e
5 changed files with 53 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pvAccessApp/remote/blockingTCP.h
View File

@@ -472,6 +472,18 @@ namespace epics {
return &_introspectionRegistry;
}
virtual void cachedSerialize(
const std::tr1::shared_ptr<const epics::pvData::Field>& field, epics::pvData::ByteBuffer* buffer)
{
getIntrospectionRegistry()->serialize(field, buffer, this);
}
virtual std::tr1::shared_ptr<const epics::pvData::Field>
cachedDeserialize(epics::pvData::ByteBuffer* buffer)
{
return getIntrospectionRegistry()->deserialize(buffer, this);
}
/**
* Acquires transport.
* @param client client (channel) acquiring the transport
@@ -651,6 +663,18 @@ namespace epics {
return &_introspectionRegistry;
}
virtual void cachedSerialize(
const std::tr1::shared_ptr<const epics::pvData::Field>& field, epics::pvData::ByteBuffer* buffer)
{
getIntrospectionRegistry()->serialize(field, buffer, this);
}
virtual std::tr1::shared_ptr<const epics::pvData::Field>
cachedDeserialize(epics::pvData::ByteBuffer* buffer)
{
return getIntrospectionRegistry()->deserialize(buffer, this);
}
/**
* Preallocate new channel SID.
* @return new channel server id (SID).

17
pvAccessApp/remote/blockingUDP.h
View File

@@ -16,6 +16,8 @@
#include <pv/lock.h>
#include <pv/event.h>
#include <pv/pvIntrospect.h>
#include <osdSock.h>
#include <osiSock.h>
#include <epicsThread.h>
@@ -140,6 +142,21 @@ namespace epics {
_sendBuffer->align(alignment);
}
virtual void cachedSerialize(
const std::tr1::shared_ptr<const epics::pvData::Field>& field, epics::pvData::ByteBuffer* buffer)
{
// no cache
field->serialize(buffer, this);
}
virtual std::tr1::shared_ptr<const epics::pvData::Field>
cachedDeserialize(epics::pvData::ByteBuffer* buffer)
{
// no cache
// TODO
return epics::pvData::getFieldCreate()->deserialize(buffer, this);
}
/**
* Set ignore list.
* @param addresses list of ignored addresses.

6
pvAccessApp/remote/simpleChannelSearchManagerImpl.h
View File

@@ -27,6 +27,12 @@ public:
void ensureBuffer(int size) {}
void alignBuffer(int alignment) {}
void flushSerializeBuffer() {}
void cachedSerialize(
const std::tr1::shared_ptr<const epics::pvData::Field>& field, epics::pvData::ByteBuffer* buffer)
{
// no cache
field->serialize(buffer, this);
}
};

114
pvAccessApp/utils/introspectionRegistry.cpp
View File

@@ -173,64 +173,15 @@ void IntrospectionRegistry::serialize(FieldConstPtr field, StructureConstPtr par
buffer->putShort(key);
}
}
// NOTE: high nibble is field.getType() ordinal, low nibble is scalar type ordinal; -1 is null
switch (field->getType())
{
case epics::pvData::scalar:
{
ScalarConstPtr scalar = static_pointer_cast<const Scalar>(field);
control->ensureBuffer(1);
buffer->putByte((int8)(epics::pvData::scalar << 4 | scalar->getScalarType()));
SerializeHelper::serializeString(field->getFieldName(), buffer, control);
break;
}
case epics::pvData::scalarArray:
{
ScalarArrayConstPtr array = static_pointer_cast<const ScalarArray>(field);
control->ensureBuffer(1);
buffer->putByte((int8)(epics::pvData::scalarArray << 4 | array->getElementType()));
SerializeHelper::serializeString(field->getFieldName(), buffer, control);
break;
}
case epics::pvData::structure:
{
StructureConstPtr structure = static_pointer_cast<const Structure>(field);
control->ensureBuffer(1);
buffer->putByte((int8)(epics::pvData::structure << 4));
serializeStructureField(buffer, control, registry, structure);
break;
}
case epics::pvData::structureArray:
{
StructureArrayConstPtr structureArray = static_pointer_cast<const StructureArray>(field);
control->ensureBuffer(1);
buffer->putByte((int8)(epics::pvData::structureArray << 4));
SerializeHelper::serializeString(field->getFieldName(), buffer, control);
// we also need to serialize structure field...
StructureConstPtr structureElement = structureArray->getStructure();
serializeStructureField(buffer, control, registry, structureElement);
break;
}
}
}
}
void IntrospectionRegistry::serializeStructureField(ByteBuffer* buffer, SerializableControl* control,
IntrospectionRegistry* registry, StructureConstPtr structure)
{
SerializeHelper::serializeString(structure->getFieldName(), buffer, control);
FieldConstPtrArray fields = structure->getFields();
SerializeHelper::writeSize(structure->getNumberFields(), buffer, control);
for (int i = 0; i < structure->getNumberFields(); i++)
{
serialize(fields[i], structure, buffer, control, registry);
field->serialize(buffer, control);
}
}
FieldConstPtr IntrospectionRegistry::deserialize(ByteBuffer* buffer, DeserializableControl* control, IntrospectionRegistry* registry)
{
control->ensureData(1);
uintptr_t pos = buffer->getPosition();
const int8 typeCode = buffer->getByte();
if(typeCode == IntrospectionRegistry::NULL_TYPE_CODE)
{
@@ -254,62 +205,9 @@ FieldConstPtr IntrospectionRegistry::deserialize(ByteBuffer* buffer, Deserializa
return field;
}
// high nibble means scalar/array/structure
const Type type = (Type)(typeCode >> 4);
switch (type)
{
case scalar:
{
const ScalarType scalar = (ScalarType)(typeCode & 0x0F);
const String scalarFieldName = SerializeHelper::deserializeString(buffer, control);
return static_cast<FieldConstPtr>(_fieldCreate->createScalar(scalarFieldName,scalar));
}
case scalarArray:
{
const ScalarType element = (ScalarType)(typeCode & 0x0F);
const String arrayFieldName = SerializeHelper::deserializeString(buffer, control);
return static_cast<FieldConstPtr>(_fieldCreate->createScalarArray(arrayFieldName,element));
}
case structure:
{
return static_cast<FieldConstPtr>(deserializeStructureField(buffer, control, registry));
}
case structureArray:
{
const String structureArrayFieldName = SerializeHelper::deserializeString(buffer, control);
const StructureConstPtr arrayElement = deserializeStructureField(buffer, control, registry);
return static_cast<FieldConstPtr>(_fieldCreate->createStructureArray(structureArrayFieldName, arrayElement));
}
default:
{
// TODO log
return FieldConstPtr();
}
}
}
StructureConstPtr IntrospectionRegistry::deserializeStructureField(ByteBuffer* buffer, DeserializableControl* control, IntrospectionRegistry* registry)
{
const String structureFieldName = SerializeHelper::deserializeString(buffer, control);
const int32 size = SerializeHelper::readSize(buffer, control);
FieldConstPtrArray fields = NULL;
if (size > 0)
{
fields = new FieldConstPtr[size];
for(int i = 0; i < size; i++)
{
try {
fields[i] = deserialize(buffer, control, registry);
} catch (...) {
delete[] fields;
throw;
}
}
}
StructureConstPtr structure = _fieldCreate->createStructure(structureFieldName, size, fields);
return structure;
buffer->setPosition(pos);
// TODO
return getFieldCreate()->deserialize(buffer, control);
}
void IntrospectionRegistry::serializeStructure(ByteBuffer* buffer, SerializableControl* control, PVStructurePtr pvStructure)

17
pvAccessApp/utils/introspectionRegistry.h
View File

@@ -136,14 +136,6 @@ typedef std::map<const short,epics::pvData::FieldConstPtr> registryMap_t;
epics::pvData::SerializableControl* control, IntrospectionRegistry* registry);
/**
* @param buffer
* @param control
* @param registry
* @param structure
*/
static void serializeStructureField(epics::pvData::ByteBuffer* buffer, epics::pvData::SerializableControl* control,
IntrospectionRegistry* registry, epics::pvData::StructureConstPtr structure);
/**
* @param buffer
@@ -153,15 +145,6 @@ typedef std::map<const short,epics::pvData::FieldConstPtr> registryMap_t;
*/
static epics::pvData::FieldConstPtr deserialize(epics::pvData::ByteBuffer* buffer, epics::pvData::DeserializableControl* control, IntrospectionRegistry* registry);
/**
* Deserialize Structure.
* @param buffer
* @param control
* @param registry
* @return deserialized Structure instance.
*/
static epics::pvData::StructureConstPtr deserializeStructureField(epics::pvData::ByteBuffer* buffer, epics::pvData::DeserializableControl* control, IntrospectionRegistry* registry);
/**
* Serialize optional PVStructrue.
* @param buffer data buffer.