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

reuse (if possible) existing pvStructure and bitSet

Browse Source
This commit is contained in:
Matej Sekoranja
2012-07-31 11:59:44 +02:00
parent 619d1013d0
commit ff942a1644
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pvAccessApp/remoteClient/clientContextImpl.cpp
+17 -4
View File
@@ -307,6 +307,19 @@ namespace epics {
BitSet::shared_pointer BaseRequestImpl::nullBitSet;
static BitSet::shared_pointer createBitSetFor(PVStructure::shared_pointer const & pvStructure, BitSet::shared_pointer const & existingBitSet)
{
int pvStructureSize = pvStructure->getNumberFields();
if (existingBitSet.get() && static_cast<int32>(existingBitSet->size()) >= pvStructureSize)
{
// clear existing BitSet
// also necessary if larger BitSet is reused
existingBitSet->clear();
return existingBitSet;
}
else
return BitSet::shared_pointer(new BitSet(pvStructureSize));
}
PVACCESS_REFCOUNT_MONITOR_DEFINE(channelProcess);
@@ -548,8 +561,8 @@ namespace epics {
// create data and its bitSet
{
Lock lock(m_structureMutex);
m_structure = SerializationHelper::deserializeStructureAndCreatePVStructure(payloadBuffer, transport.get());
m_bitSet.reset(new BitSet(m_structure->getNumberFields()));
m_structure = SerializationHelper::deserializeStructureAndCreatePVStructure(payloadBuffer, transport.get(), m_structure);
m_bitSet = createBitSetFor(m_structure, m_bitSet);
}
// notify
@@ -755,8 +768,8 @@ namespace epics {
// create data and its bitSet
{
Lock lock(m_structureMutex);
m_structure = SerializationHelper::deserializeStructureAndCreatePVStructure(payloadBuffer, transport.get());
m_bitSet.reset(new BitSet(m_structure->getNumberFields()));
m_structure = SerializationHelper::deserializeStructureAndCreatePVStructure(payloadBuffer, transport.get(), m_structure);
m_bitSet = createBitSetFor(m_structure, m_bitSet);
}
// notify