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

add == for introspection; == of PVField is done in base class via convert.

Browse Source 
Make monitorQueue compatible with monitor, i.e. shared_pointer
This commit is contained in:
Marty Kraimer
2011-04-27 08:27:10 -04:00
parent b45b965f14
commit 95ae684d3d
25 changed files with 157 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
pvDataApp/monitor/monitorQueue.cpp
View File

@@ -12,44 +12,46 @@
namespace epics { namespace pvData {
typedef QueueElement<MonitorElement> MonitorQueueElement;
typedef QueueElement<MonitorElement::shared_pointer> MonitorQueueElement;
class MonitorElementImpl : public MonitorElement {
public:
MonitorElementImpl(PVStructure *pvStructure);
MonitorElementImpl(PVStructure::shared_pointer pvStructure);
~MonitorElementImpl(){}
virtual PVStructure* getPVStructure();
virtual BitSet* getChangedBitSet();
virtual BitSet* getOverrunBitSet();
virtual PVStructure::shared_pointer getPVStructure();
virtual BitSet::shared_pointer getChangedBitSet();
virtual BitSet::shared_pointer getOverrunBitSet();
void setQueueElement(MonitorQueueElement *queueElement);
MonitorQueueElement *getQueueElement();
private:
PVStructure *pvStructure;
std::auto_ptr<BitSet> changedBitSet;
std::auto_ptr<BitSet> overrunBitSet;
PVStructure::shared_pointer pvStructure;
BitSet::shared_pointer changedBitSet;
BitSet::shared_pointer overrunBitSet;
MonitorQueueElement *queueElement;
};
MonitorElementImpl::MonitorElementImpl(PVStructure *pvStructure)
MonitorElementImpl::MonitorElementImpl(PVStructure::shared_pointer pvStructure)
: pvStructure(pvStructure),
changedBitSet(std::auto_ptr<BitSet>(new BitSet(pvStructure->getNumberFields()))),
overrunBitSet(std::auto_ptr<BitSet>(new BitSet(pvStructure->getNumberFields()))),
changedBitSet(BitSet::shared_pointer(
new BitSet(pvStructure->getNumberFields()))),
overrunBitSet(BitSet::shared_pointer(
new BitSet(pvStructure->getNumberFields()))),
queueElement(0)
{}
PVStructure* MonitorElementImpl::getPVStructure()
PVStructure::shared_pointer MonitorElementImpl::getPVStructure()
{
return pvStructure;
}
BitSet* MonitorElementImpl::getChangedBitSet()
BitSet::shared_pointer MonitorElementImpl::getChangedBitSet()
{
return changedBitSet.get();
return changedBitSet;
}
BitSet* MonitorElementImpl::getOverrunBitSet()
BitSet::shared_pointer MonitorElementImpl::getOverrunBitSet()
{
return overrunBitSet.get();
return overrunBitSet;
}
void MonitorElementImpl::setQueueElement(MonitorQueueElement *queueElement)
@@ -62,20 +64,28 @@ MonitorQueueElement *MonitorElementImpl::getQueueElement()
return queueElement;
}
MonitorQueue::MonitorQueue(MonitorElement** elements,int number)
MonitorQueue::MonitorQueue(PVStructure::shared_pointer* structures,int number)
: number(number),
elements(elements),
queue(new Queue<MonitorElement>(elements,number))
structures(structures),
queue(0)
{
if(number<2) {
throw std::logic_error(String("queueSize must be >=2"));
}
MonitorQueueElement *queueElement;
MonitorElement::shared_pointer ** queueElements
= new MonitorElement::shared_pointer*[number];
for(int i=0; i<number; i++) {
queueElements[i] = new MonitorElement::shared_pointer(
new MonitorElementImpl(structures[i]));
}
queue = new Queue<MonitorElement::shared_pointer>(queueElements,number);
MonitorQueueElement *queueElement;
for(int i=0; i<number;i++) {
queueElement = queue->getFree();
MonitorElementImpl *temp =
static_cast<MonitorElementImpl*>(queueElement->getObject());
temp->setQueueElement(queueElement);
MonitorElementImpl * element = static_cast<MonitorElementImpl *>(
queueElement->getObject()->get());
element->setQueueElement(queueElement);
queue->setUsed(queueElement);
queue->releaseUsed(queueElement);
}
@@ -84,17 +94,16 @@ MonitorQueue::MonitorQueue(MonitorElement** elements,int number)
MonitorQueue::~MonitorQueue()
{
delete queue;
for(int i=0; i<number; i++) {
delete elements[i];
}
delete[] elements;
delete[] structures;
}
MonitorElement** MonitorQueue::createElements(PVStructurePtrArray array,int number)
PVStructure::shared_pointer* MonitorQueue::createStructures(
PVStructurePtrArray array,int number)
{
MonitorElement** elements = new MonitorElement*[number];
for(int i=0; i<number; i++) {
elements[i] = new MonitorElementImpl(array[i]);
PVStructure::shared_pointer* elements =
new PVStructure::shared_pointer[number];
for(int i=0; i<number; i++){
elements[i] = PVStructure::shared_pointer(array[i]);
}
return elements;
}
@@ -114,30 +123,31 @@ int MonitorQueue::capacity()
return number;
}
MonitorElement * MonitorQueue::getFree()
MonitorElement::shared_pointer MonitorQueue::getFree()
{
MonitorQueueElement *queueElement = queue->getFree();
if(queueElement==0) return 0;
return queueElement->getObject();
if(queueElement==0) return MonitorElement::shared_pointer();
return *queueElement->getObject();
}
void MonitorQueue::setUsed(MonitorElement * element)
void MonitorQueue::setUsed(MonitorElement::shared_pointer element)
{
MonitorElementImpl *temp = static_cast<MonitorElementImpl*>(element);
queue->setUsed(temp->getQueueElement());
MonitorElementImpl *impl = static_cast<MonitorElementImpl *>(element.get());
queue->setUsed(impl->getQueueElement());
}
MonitorElement * MonitorQueue::getUsed()
MonitorElement::shared_pointer MonitorQueue::getUsed()
{
MonitorQueueElement *queueElement = queue->getUsed();
if(queueElement==0) return 0;
return queueElement->getObject();
if(queueElement==0) return MonitorElement::shared_pointer();
return *queueElement->getObject();
}
void MonitorQueue::releaseUsed(MonitorElement * element)
void MonitorQueue::releaseUsed(MonitorElement::shared_pointer element)
{
MonitorElementImpl *temp = static_cast<MonitorElementImpl*>(element);
queue->releaseUsed(temp->getQueueElement());
MonitorElementImpl *impl = static_cast<MonitorElementImpl *>(element.get());
queue->releaseUsed(impl->getQueueElement());
}