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

remove necessary indirection

Browse Source
This commit is contained in:
Michael Davidsaver
2017-06-28 15:24:10 +02:00
parent 49d90167b4
commit 83ee4522ce
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/remoteClient/clientContextImpl.cpp
View File

@@ -1852,8 +1852,8 @@ private:
Mutex m_mutex;
BitSet::shared_pointer m_bitSet1;
BitSet::shared_pointer m_bitSet2;
BitSet m_bitSet1;
BitSet m_bitSet2;
MonitorElement::shared_pointer m_overrunElement;
bool m_overrunInProgress;
@@ -1940,24 +1940,20 @@ public:
BitSet::shared_pointer changedBitSet = m_overrunElement->changedBitSet;
BitSet::shared_pointer overrunBitSet = m_overrunElement->overrunBitSet;
// lazy init
if (m_bitSet1.get() == 0) m_bitSet1.reset(new BitSet(changedBitSet->size()));
if (m_bitSet2.get() == 0) m_bitSet2.reset(new BitSet(overrunBitSet->size()));
m_bitSet1->deserialize(payloadBuffer, transport.get());
pvStructure->deserialize(payloadBuffer, transport.get(), m_bitSet1.get());
m_bitSet2->deserialize(payloadBuffer, transport.get());
m_bitSet1.deserialize(payloadBuffer, transport.get());
pvStructure->deserialize(payloadBuffer, transport.get(), &m_bitSet1);
m_bitSet2.deserialize(payloadBuffer, transport.get());
// OR local overrun
// TODO this does not work perfectly if bitSet is compressed !!!
// uncompressed bitSets should be used !!!
overrunBitSet->or_and(*(changedBitSet.get()), *(m_bitSet1.get()));
overrunBitSet->or_and(*(changedBitSet.get()), m_bitSet1);
// OR remove change
*(changedBitSet.get()) |= *(m_bitSet1.get());
*(changedBitSet.get()) |= m_bitSet1;
// OR remote overrun
*(overrunBitSet.get()) |= *(m_bitSet2.get());
*(overrunBitSet.get()) |= m_bitSet2;
// m_up2datePVStructure is already set