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

merge

Browse Source
This commit is contained in:
Matej Sekoranja
2014-11-06 22:34:49 +01:00
parent b263acebbc 670dcb27ea
commit 3917483cb6
11 changed files with 453 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
testApp/remote/testServer.cpp
View File

@@ -6,6 +6,10 @@
#define NOMINMAX
#endif
// TODO not nice
// disable buggy boost enable_shared_from_this assert code
#define BOOST_DISABLE_ASSERTS
#include <pv/serverContext.h>
#include <pv/clientContextImpl.h>
#include <epicsExit.h>
@@ -25,7 +29,6 @@
// TODO temp
#include "testADCSim.cpp"
using namespace epics::pvAccess;
using namespace epics::pvData;
using namespace std;
@@ -1872,7 +1875,7 @@ private:
MonitorRequester::shared_pointer m_monitorRequester;
bool m_continuous;
PVStructure::shared_pointer m_pvStructure;
PVStructure::shared_pointer m_copy;
PVStructure::shared_pointer m_ccopy;
BitSet::shared_pointer m_changedBitSet;
BitSet::shared_pointer m_overrunBitSet;
Mutex m_lock;
@@ -1891,7 +1894,7 @@ protected:
m_monitorRequester(monitorRequester),
m_continuous(false),
m_pvStructure(getRequestedStructure(pvStructure, pvRequest)),
m_copy(getPVDataCreate()->createPVStructure(m_pvStructure->getStructure())),
m_ccopy(getPVDataCreate()->createPVStructure(m_pvStructure->getStructure())),
m_changedBitSet(new BitSet(m_pvStructure->getNumberFields())),
m_overrunBitSet(new BitSet(m_pvStructure->getNumberFields())),
m_lock(),
@@ -1907,7 +1910,7 @@ protected:
// we always send all
m_changedBitSet->set(0);
m_thisPtr->pvStructurePtr = m_copy;
m_thisPtr->pvStructurePtr = m_ccopy;
m_thisPtr->changedBitSet = m_changedBitSet;
m_thisPtr->overrunBitSet = m_overrunBitSet;
}
@@ -1941,7 +1944,7 @@ public:
{
{
lock();
getConvert()->copyStructure(m_pvStructure, m_copy);
getConvert()->copyStructure(m_pvStructure, m_ccopy);
unlock();
}
}