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

remove monitorQueue

Browse Source
This commit is contained in:
Marty Kraimer
2012-07-03 14:52:30 -04:00
parent 9775fd4707
commit 5d57e9bbcf
3 changed files with 0 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pvDataApp/Makefile
View File

@@ -94,7 +94,6 @@ LIBSRCS += bitSetUtil.cpp
SRC_DIRS += $(PVDATA)/monitor
INC += monitor.h
INC += monitorQueue.h
LIBRARY=pvData

105
pvDataApp/monitor/monitorQueue.h
View File

@@ -1,105 +0,0 @@
/* monitorQueue.h */
/**
* Copyright - See the COPYRIGHT that is included with this distribution.
* EPICS pvDataCPP is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
*/
/* Marty Kraimer 2011.03 */
#ifndef MONITORQUEUE_H
#define MONITORQUEUE_H
#include <string>
#include <stdexcept>
#include <memory>
#include <vector>
#include <pv/pvData.h>
#include <pv/monitor.h>
#include <pv/queue.h>
#include <pv/sharedPtr.h>
namespace epics { namespace pvData {
class MonitorQueue;
typedef std::tr1::shared_ptr<MonitorQueue> MonitorQueuePtr;
class MonitorQueue {
public:
static MonitorQueuePtr create(
StructureConstPtr & elementStructure,int number);
MonitorQueue(MonitorElementPtrArray &monitorElementArray);
~MonitorQueue(){}
void clear();
int getNumberFree();
int capacity();
MonitorElementPtr & getFree();
void setUsed(MonitorElementPtr & element);
MonitorElementPtr & getUsed();
void releaseUsed(MonitorElementPtr & element);
private:
MonitorElementPtr nullElement;
MonitorElementPtrArray elementArray;
Queue<MonitorElement> queue;
};
MonitorQueuePtr MonitorQueue::create(
StructureConstPtr & elementStructure,int number)
{
PVDataCreatePtr pvDataCreate = getPVDataCreate();
MonitorElementPtrArray elementArray;
elementArray.reserve(number);
for(int i=0; i<number; i++) {
PVStructurePtr pvStructurePtr
= pvDataCreate->createPVStructure(elementStructure);
MonitorElementPtr monitorElement(new MonitorElement(pvStructurePtr));
elementArray.push_back(monitorElement);
}
return MonitorQueuePtr(new MonitorQueue(elementArray));
}
MonitorQueue::MonitorQueue(MonitorElementPtrArray &monitorElementArray)
: queue(monitorElementArray)
{
}
void MonitorQueue::clear()
{
queue.clear();
}
int MonitorQueue::getNumberFree()
{
return queue.getNumberFree();
}
int MonitorQueue::capacity()
{
return queue.capacity();
}
MonitorElementPtr & MonitorQueue::getFree()
{
MonitorElementPtr &queueElement = queue.getFree();
if(queueElement.get()==0) return nullElement;
return queueElement;
}
void MonitorQueue::setUsed(MonitorElementPtr & element)
{
queue.setUsed(element);
}
MonitorElementPtr & MonitorQueue::getUsed()
{
MonitorElementPtr &queueElement = queue.getUsed();
if(queueElement.get()==0) return nullElement;
return queueElement;
}
void MonitorQueue::releaseUsed(MonitorElementPtr & element)
{
queue.releaseUsed(element);
}
}}
#endif /* MONITORQUEUE_H */

26
testApp/monitor/testMonitor.cpp
View File

@@ -20,7 +20,6 @@
#include <pv/pvIntrospect.h>
#include <pv/pvData.h>
#include <pv/monitor.h>
#include <pv/monitorQueue.h>
#include <pv/standardField.h>
@@ -69,34 +68,9 @@ static void testMonitor()
monitor->stop();
}
static void testMonitorQueue()
{
int queueSize = 3;
StructureConstPtr structure = standardField->scalar(pvDouble,allProperties);
MonitorQueuePtr monitorQueue = MonitorQueue::create(structure,queueSize);
int numberFree = monitorQueue->getNumberFree();
printf("start numberFree %d\n",numberFree);
MonitorElementPtr element = monitorQueue->getFree();
numberFree = monitorQueue->getNumberFree();
printf("after getFree numberFree %d\n",numberFree);
PVStructurePtr pvStructure = element->pvStructurePtr;
String buffer;
buffer.clear();
pvStructure->toString(&buffer);
//printf("pvStructure\n%s\n",buffer.c_str());
monitorQueue->setUsed(element);
element = monitorQueue->getUsed();
assert(element.get()!=NULL);
numberFree = monitorQueue->getNumberFree();
printf("after getUsed numberFree %d\n",numberFree);
monitorQueue->releaseUsed(element);
numberFree = monitorQueue->getNumberFree();
printf("after releaseUsed numberFree %d\n",numberFree);
}
int main(int argc,char *argv[])
{
testMonitorQueue();
testMonitor();
return(0);
}