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

bitSetUtil was changed in pvDataCPP

Browse Source
This commit is contained in:
Marty Kraimer
2013-05-16 09:05:36 -04:00
parent 6c14f27641
commit a3a2c12ab3
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pvAccessApp/remoteClient/clientContextImpl.cpp
View File

@@ -2045,8 +2045,8 @@ namespace epics {
// compress if needed
if (m_needToCompress)
{
BitSetUtil::compress(m_monitorElement->changedBitSet.get(), m_monitorElement->pvStructurePtr.get());
BitSetUtil::compress(m_monitorElement->overrunBitSet.get(), m_monitorElement->pvStructurePtr.get());
BitSetUtil::compress(m_monitorElement->changedBitSet, m_monitorElement->pvStructurePtr);
BitSetUtil::compress(m_monitorElement->overrunBitSet, m_monitorElement->pvStructurePtr);
m_needToCompress = false;
}
@@ -2159,8 +2159,8 @@ namespace epics {
PVStructurePtr pvStructure = m_monitorElement->pvStructurePtr;
getConvert()->copy(pvStructure, newElement->pvStructurePtr);
BitSetUtil::compress(m_monitorElement->changedBitSet.get(), pvStructure.get());
BitSetUtil::compress(m_monitorElement->overrunBitSet.get(), pvStructure.get());
BitSetUtil::compress(m_monitorElement->changedBitSet, pvStructure);
BitSetUtil::compress(m_monitorElement->overrunBitSet, pvStructure);
//monitorQueue.setUsed(monitorElement);
@@ -2223,8 +2223,8 @@ namespace epics {
// if there was overrun in progress we manipulated bitSets... compress them
if (m_overrunInProgress) {
BitSetUtil::compress(changedBitSet.get(), pvStructure.get());
BitSetUtil::compress(overrunBitSet.get(), pvStructure.get());
BitSetUtil::compress(changedBitSet, pvStructure);
BitSetUtil::compress(overrunBitSet, pvStructure);
m_overrunInProgress = false;
}
@@ -2262,8 +2262,8 @@ namespace epics {
PVStructurePtr pvStructure = m_monitorElement->pvStructurePtr;
getConvert()->copy(pvStructure, newElement->pvStructurePtr);
BitSetUtil::compress(m_monitorElement->changedBitSet.get(), pvStructure.get());
BitSetUtil::compress(m_monitorElement->overrunBitSet.get(), pvStructure.get());
BitSetUtil::compress(m_monitorElement->changedBitSet, pvStructure);
BitSetUtil::compress(m_monitorElement->overrunBitSet, pvStructure);
//monitorQueue.setUsed(monitorElement);
m_monitorElement = newElement;

7
testApp/client/testCreateRequest.cpp
View File

@@ -43,6 +43,13 @@ void testCreateRequest() {
assert(pvRequest.get());
out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;
request = "record[process=true]field(alarm,timeStamp)putField(synput:a,synput:b,stnput:c)";
std::cout << std::endl << String("request") <<std::endl << request <<std::endl;
pvRequest = getCreateRequest()->createRequest(request,requester);
assert(pvRequest.get());
out.clear(); pvRequest->toString(&out); std::cout << out << std::endl;
request = "alarm,timeStamp,power.value";
std::cout << std::endl << String("request") <<std::endl << request <<std::endl;
pvRequest = getCreateRequest()->createRequest(request,requester);