Merge with 8a3fa7abb5b7252e3b803e443685b286d2724fb3
This commit is contained in:
miha_vitorovic
@@ -11,6 +11,325 @@
|
||||
using namespace epics::pvData;
|
||||
using namespace epics::pvAccess;
|
||||
|
||||
static volatile int64 mockChannelGet_totalConstruct = 0;
|
||||
static volatile int64 mockChannelGet_totalDestruct = 0;
|
||||
static Mutex *mockChannelGet_globalMutex = 0;
|
||||
|
||||
static int64 mockChannelGet_getTotalConstruct()
|
||||
{
|
||||
Lock xx(mockChannelGet_globalMutex);
|
||||
return mockChannelGet_totalConstruct;
|
||||
}
|
||||
|
||||
static int64 mockChannelGet_getTotalDestruct()
|
||||
{
|
||||
Lock xx(mockChannelGet_globalMutex);
|
||||
return mockChannelGet_totalDestruct;
|
||||
}
|
||||
|
||||
static ConstructDestructCallback *mockChannelGet_pConstructDestructCallback;
|
||||
|
||||
static void mockChannelGet_init()
|
||||
{
|
||||
static Mutex mutex = Mutex();
|
||||
Lock xx(&mutex);
|
||||
if(mockChannelGet_globalMutex==0) {
|
||||
mockChannelGet_globalMutex = new Mutex();
|
||||
mockChannelGet_pConstructDestructCallback = new ConstructDestructCallback(
|
||||
String("mockChannelGet"),
|
||||
mockChannelGet_getTotalConstruct,mockChannelGet_getTotalDestruct,0);
|
||||
}
|
||||
}
|
||||
|
||||
class MockChannelGet : public ChannelGet
|
||||
{
|
||||
private:
|
||||
ChannelGetRequester* m_channelGetRequester;
|
||||
PVStructure* m_pvStructure;
|
||||
BitSet* m_bitSet;
|
||||
volatile bool m_first;
|
||||
|
||||
private:
|
||||
~MockChannelGet()
|
||||
{
|
||||
Lock xx(mockChannelGet_globalMutex);
|
||||
mockChannelGet_totalDestruct++;
|
||||
}
|
||||
|
||||
public:
|
||||
MockChannelGet(ChannelGetRequester* channelGetRequester, PVStructure *pvStructure, PVStructure *pvRequest) :
|
||||
m_channelGetRequester(channelGetRequester), m_pvStructure(pvStructure),
|
||||
m_bitSet(new BitSet(pvStructure->getNumberFields())), m_first(true)
|
||||
{
|
||||
mockChannelGet_init();
|
||||
|
||||
Lock xx(mockChannelGet_globalMutex);
|
||||
mockChannelGet_totalConstruct++;
|
||||
|
||||
// TODO pvRequest
|
||||
m_channelGetRequester->channelGetConnect(getStatusCreate()->getStatusOK(), this, m_pvStructure, m_bitSet);
|
||||
}
|
||||
|
||||
virtual void get(bool lastRequest)
|
||||
{
|
||||
m_channelGetRequester->getDone(getStatusCreate()->getStatusOK());
|
||||
if (m_first)
|
||||
{
|
||||
m_first = false;
|
||||
m_bitSet->set(0); // TODO
|
||||
}
|
||||
|
||||
if (lastRequest)
|
||||
destroy();
|
||||
}
|
||||
|
||||
virtual void destroy()
|
||||
{
|
||||
delete m_bitSet;
|
||||
delete this;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
static volatile int64 mockChannelPut_totalConstruct = 0;
|
||||
static volatile int64 mockChannelPut_totalDestruct = 0;
|
||||
static Mutex *mockChannelPut_globalMutex = 0;
|
||||
|
||||
static int64 mockChannelPut_getTotalConstruct()
|
||||
{
|
||||
Lock xx(mockChannelPut_globalMutex);
|
||||
return mockChannelPut_totalConstruct;
|
||||
}
|
||||
|
||||
static int64 mockChannelPut_getTotalDestruct()
|
||||
{
|
||||
Lock xx(mockChannelPut_globalMutex);
|
||||
return mockChannelPut_totalDestruct;
|
||||
}
|
||||
|
||||
static ConstructDestructCallback *mockChannelPut_pConstructDestructCallback;
|
||||
|
||||
static void mockChannelPut_init()
|
||||
{
|
||||
static Mutex mutex = Mutex();
|
||||
Lock xx(&mutex);
|
||||
if(mockChannelPut_globalMutex==0) {
|
||||
mockChannelPut_globalMutex = new Mutex();
|
||||
mockChannelPut_pConstructDestructCallback = new ConstructDestructCallback(
|
||||
String("mockChannelPut"),
|
||||
mockChannelPut_getTotalConstruct,mockChannelPut_getTotalDestruct,0);
|
||||
}
|
||||
}
|
||||
|
||||
class MockChannelPut : public ChannelPut
|
||||
{
|
||||
private:
|
||||
ChannelPutRequester* m_channelPutRequester;
|
||||
PVStructure* m_pvStructure;
|
||||
BitSet* m_bitSet;
|
||||
volatile bool m_first;
|
||||
|
||||
private:
|
||||
~MockChannelPut()
|
||||
{
|
||||
Lock xx(mockChannelPut_globalMutex);
|
||||
mockChannelPut_totalDestruct++;
|
||||
}
|
||||
|
||||
public:
|
||||
MockChannelPut(ChannelPutRequester* channelPutRequester, PVStructure *pvStructure, PVStructure *pvRequest) :
|
||||
m_channelPutRequester(channelPutRequester), m_pvStructure(pvStructure),
|
||||
m_bitSet(new BitSet(pvStructure->getNumberFields())), m_first(true)
|
||||
{
|
||||
mockChannelPut_init();
|
||||
|
||||
Lock xx(mockChannelPut_globalMutex);
|
||||
mockChannelPut_totalConstruct++;
|
||||
|
||||
// TODO pvRequest
|
||||
m_channelPutRequester->channelPutConnect(getStatusCreate()->getStatusOK(), this, m_pvStructure, m_bitSet);
|
||||
}
|
||||
|
||||
virtual void put(bool lastRequest)
|
||||
{
|
||||
m_channelPutRequester->putDone(getStatusCreate()->getStatusOK());
|
||||
if (lastRequest)
|
||||
destroy();
|
||||
}
|
||||
|
||||
virtual void get()
|
||||
{
|
||||
m_channelPutRequester->getDone(getStatusCreate()->getStatusOK());
|
||||
}
|
||||
|
||||
virtual void destroy()
|
||||
{
|
||||
delete m_bitSet;
|
||||
delete this;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
static volatile int64 mockMonitor_totalConstruct = 0;
|
||||
static volatile int64 mockMonitor_totalDestruct = 0;
|
||||
static Mutex *mockMonitor_globalMutex = 0;
|
||||
|
||||
static int64 mockMonitor_getTotalConstruct()
|
||||
{
|
||||
Lock xx(mockMonitor_globalMutex);
|
||||
return mockMonitor_totalConstruct;
|
||||
}
|
||||
|
||||
static int64 mockMonitor_getTotalDestruct()
|
||||
{
|
||||
Lock xx(mockMonitor_globalMutex);
|
||||
return mockMonitor_totalDestruct;
|
||||
}
|
||||
|
||||
static ConstructDestructCallback *mockMonitor_pConstructDestructCallback;
|
||||
|
||||
static void mockMonitor_init()
|
||||
{
|
||||
static Mutex mutex = Mutex();
|
||||
Lock xx(&mutex);
|
||||
if(mockMonitor_globalMutex==0) {
|
||||
mockMonitor_globalMutex = new Mutex();
|
||||
mockMonitor_pConstructDestructCallback = new ConstructDestructCallback(
|
||||
String("mockMonitor"),
|
||||
mockMonitor_getTotalConstruct,mockMonitor_getTotalDestruct,0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
class MockMonitor : public Monitor, public MonitorElement
|
||||
{
|
||||
private:
|
||||
MonitorRequester* m_monitorRequester;
|
||||
PVStructure* m_pvStructure;
|
||||
BitSet* m_changedBitSet;
|
||||
BitSet* m_overrunBitSet;
|
||||
volatile bool m_first;
|
||||
Mutex* m_lock;
|
||||
volatile int m_count;
|
||||
|
||||
private:
|
||||
~MockMonitor()
|
||||
{
|
||||
Lock xx(mockMonitor_globalMutex);
|
||||
mockMonitor_totalDestruct++;
|
||||
}
|
||||
|
||||
public:
|
||||
MockMonitor(MonitorRequester* monitorRequester, PVStructure *pvStructure, PVStructure *pvRequest) :
|
||||
m_monitorRequester(monitorRequester), m_pvStructure(pvStructure),
|
||||
m_changedBitSet(new BitSet(pvStructure->getNumberFields())),
|
||||
m_overrunBitSet(new BitSet(pvStructure->getNumberFields())),
|
||||
m_first(true),
|
||||
m_lock(new Mutex()),
|
||||
m_count(0)
|
||||
{
|
||||
mockMonitor_init();
|
||||
|
||||
Lock xx(mockMonitor_globalMutex);
|
||||
mockMonitor_totalConstruct++;
|
||||
|
||||
m_changedBitSet->set(0);
|
||||
|
||||
// TODO pvRequest
|
||||
m_monitorRequester->monitorConnect(getStatusCreate()->getStatusOK(), this, const_cast<Structure*>(m_pvStructure->getStructure()));
|
||||
}
|
||||
|
||||
virtual Status* start()
|
||||
{
|
||||
// fist monitor
|
||||
m_monitorRequester->monitorEvent(this);
|
||||
|
||||
// client needs to delete status, so passing shared OK instance is not right thing to do
|
||||
return getStatusCreate()->createStatus(STATUSTYPE_OK, "Monitor started.");
|
||||
}
|
||||
|
||||
virtual Status* stop()
|
||||
{
|
||||
// client needs to delete status, so passing shared OK instance is not right thing to do
|
||||
return getStatusCreate()->createStatus(STATUSTYPE_OK, "Monitor stopped.");
|
||||
}
|
||||
|
||||
virtual MonitorElement* poll()
|
||||
{
|
||||
Lock xx(m_lock);
|
||||
if (m_count)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_count++;
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
||||
virtual void release(MonitorElement* monitorElement)
|
||||
{
|
||||
Lock xx(m_lock);
|
||||
if (m_count)
|
||||
m_count--;
|
||||
}
|
||||
|
||||
virtual void destroy()
|
||||
{
|
||||
delete stop();
|
||||
|
||||
delete m_lock;
|
||||
delete m_overrunBitSet;
|
||||
delete m_changedBitSet;
|
||||
delete this;
|
||||
}
|
||||
|
||||
// ============ MonitorElement ============
|
||||
|
||||
virtual PVStructure* getPVStructure()
|
||||
{
|
||||
return m_pvStructure;
|
||||
}
|
||||
|
||||
virtual BitSet* getChangedBitSet()
|
||||
{
|
||||
return m_changedBitSet;
|
||||
}
|
||||
|
||||
virtual BitSet* getOverrunBitSet()
|
||||
{
|
||||
return m_overrunBitSet;
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
static volatile int64 mockChannel_totalConstruct = 0;
|
||||
static volatile int64 mockChannel_totalDestruct = 0;
|
||||
static Mutex *mockChannel_globalMutex = 0;
|
||||
@@ -49,13 +368,11 @@ class MockChannel : public Channel {
|
||||
String m_name;
|
||||
String m_remoteAddress;
|
||||
|
||||
PVStructure* pvStructure;
|
||||
PVStructure* m_pvStructure;
|
||||
|
||||
private:
|
||||
~MockChannel()
|
||||
{
|
||||
delete pvStructure;
|
||||
|
||||
Lock xx(mockChannel_globalMutex);
|
||||
mockChannel_totalDestruct++;
|
||||
}
|
||||
@@ -81,9 +398,9 @@ class MockChannel : public Channel {
|
||||
ScalarType stype = pvDouble;
|
||||
String allProperties("alarm,timeStamp,display,control,valueAlarm");
|
||||
|
||||
pvStructure = getStandardPVField()->scalar(
|
||||
m_pvStructure = getStandardPVField()->scalar(
|
||||
0,name,stype,allProperties);
|
||||
PVDouble *pvField = pvStructure->getDoubleField(String("value"));
|
||||
PVDouble *pvField = m_pvStructure->getDoubleField(String("value"));
|
||||
pvField->put(1.123e35);
|
||||
|
||||
|
||||
@@ -93,6 +410,7 @@ class MockChannel : public Channel {
|
||||
|
||||
virtual void destroy()
|
||||
{
|
||||
delete m_pvStructure;
|
||||
delete this;
|
||||
};
|
||||
|
||||
@@ -143,7 +461,7 @@ class MockChannel : public Channel {
|
||||
|
||||
virtual void getField(GetFieldRequester *requester,epics::pvData::String subField)
|
||||
{
|
||||
requester->getDone(getStatusCreate()->getStatusOK(),pvStructure->getSubField(subField)->getField());
|
||||
requester->getDone(getStatusCreate()->getStatusOK(),m_pvStructure->getSubField(subField)->getField());
|
||||
}
|
||||
|
||||
virtual ChannelProcess* createChannelProcess(
|
||||
@@ -158,16 +476,14 @@ class MockChannel : public Channel {
|
||||
ChannelGetRequester *channelGetRequester,
|
||||
epics::pvData::PVStructure *pvRequest)
|
||||
{
|
||||
// TODO
|
||||
return 0;
|
||||
return new MockChannelGet(channelGetRequester, m_pvStructure, pvRequest);
|
||||
}
|
||||
|
||||
virtual ChannelPut* createChannelPut(
|
||||
ChannelPutRequester *channelPutRequester,
|
||||
epics::pvData::PVStructure *pvRequest)
|
||||
{
|
||||
// TODO
|
||||
return 0;
|
||||
return new MockChannelPut(channelPutRequester, m_pvStructure, pvRequest);
|
||||
}
|
||||
|
||||
virtual ChannelPutGet* createChannelPutGet(
|
||||
@@ -189,8 +505,7 @@ class MockChannel : public Channel {
|
||||
epics::pvData::MonitorRequester *monitorRequester,
|
||||
epics::pvData::PVStructure *pvRequest)
|
||||
{
|
||||
// TODO
|
||||
return 0;
|
||||
return new MockMonitor(monitorRequester, m_pvStructure, pvRequest);
|
||||
}
|
||||
|
||||
virtual ChannelArray* createChannelArray(
|
||||
@@ -354,10 +669,8 @@ class ChannelFindRequesterImpl : public ChannelFindRequester
|
||||
{
|
||||
virtual void channelFindResult(epics::pvData::Status *status,ChannelFind *channelFind,bool wasFound)
|
||||
{
|
||||
std::cout << "[ChannelFindRequesterImpl] channelFindResult(";
|
||||
String str;
|
||||
status->toString(&str);
|
||||
std::cout << str << ", ..., " << wasFound << ")" << std::endl;
|
||||
std::cout << "[ChannelFindRequesterImpl] channelFindResult("
|
||||
<< status->toString() << ", ..., " << wasFound << ")" << std::endl;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -375,10 +688,8 @@ class ChannelRequesterImpl : public ChannelRequester
|
||||
|
||||
virtual void channelCreated(epics::pvData::Status* status, Channel *channel)
|
||||
{
|
||||
std::cout << "channelCreated(";
|
||||
String str;
|
||||
status->toString(&str);
|
||||
std::cout << str << ", " << (channel ? channel->getChannelName() : "(null)") << ")" << std::endl;
|
||||
std::cout << "channelCreated(" << status->toString() << ", "
|
||||
<< (channel ? channel->getChannelName() : "(null)") << ")" << std::endl;
|
||||
}
|
||||
|
||||
virtual void channelStateChange(Channel *c, ConnectionState connectionState)
|
||||
@@ -401,13 +712,10 @@ class GetFieldRequesterImpl : public GetFieldRequester
|
||||
|
||||
virtual void getDone(epics::pvData::Status *status,epics::pvData::FieldConstPtr field)
|
||||
{
|
||||
std::cout << "getDone(";
|
||||
String str;
|
||||
status->toString(&str);
|
||||
std::cout << str << ", ";
|
||||
std::cout << "getDone(" << status->toString() << ", ";
|
||||
if (field)
|
||||
{
|
||||
str.clear();
|
||||
String str;
|
||||
field->toString(&str);
|
||||
std::cout << str;
|
||||
}
|
||||
@@ -417,6 +725,138 @@ class GetFieldRequesterImpl : public GetFieldRequester
|
||||
}
|
||||
};
|
||||
|
||||
class ChannelGetRequesterImpl : public ChannelGetRequester
|
||||
{
|
||||
ChannelGet *m_channelGet;
|
||||
epics::pvData::PVStructure *m_pvStructure;
|
||||
epics::pvData::BitSet *m_bitSet;
|
||||
|
||||
virtual String getRequesterName()
|
||||
{
|
||||
return "ChannelGetRequesterImpl";
|
||||
};
|
||||
|
||||
virtual void message(String message,MessageType messageType)
|
||||
{
|
||||
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
|
||||
}
|
||||
|
||||
virtual void channelGetConnect(epics::pvData::Status *status,ChannelGet *channelGet,
|
||||
epics::pvData::PVStructure *pvStructure,epics::pvData::BitSet *bitSet)
|
||||
{
|
||||
std::cout << "channelGetConnect(" << status->toString() << ")" << std::endl;
|
||||
|
||||
// TODO sync
|
||||
m_channelGet = channelGet;
|
||||
m_pvStructure = pvStructure;
|
||||
m_bitSet = bitSet;
|
||||
}
|
||||
|
||||
virtual void getDone(epics::pvData::Status *status)
|
||||
{
|
||||
std::cout << "getDone(" << status->toString() << ")" << std::endl;
|
||||
String str;
|
||||
m_pvStructure->toString(&str);
|
||||
std::cout << str;
|
||||
std::cout << std::endl;
|
||||
}
|
||||
};
|
||||
|
||||
class ChannelPutRequesterImpl : public ChannelPutRequester
|
||||
{
|
||||
ChannelPut *m_channelPut;
|
||||
epics::pvData::PVStructure *m_pvStructure;
|
||||
epics::pvData::BitSet *m_bitSet;
|
||||
|
||||
virtual String getRequesterName()
|
||||
{
|
||||
return "ChannelPutRequesterImpl";
|
||||
};
|
||||
|
||||
virtual void message(String message,MessageType messageType)
|
||||
{
|
||||
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
|
||||
}
|
||||
|
||||
virtual void channelPutConnect(epics::pvData::Status *status,ChannelPut *channelPut,
|
||||
epics::pvData::PVStructure *pvStructure,epics::pvData::BitSet *bitSet)
|
||||
{
|
||||
std::cout << "channelPutConnect(" << status->toString() << ")" << std::endl;
|
||||
|
||||
// TODO sync
|
||||
m_channelPut = channelPut;
|
||||
m_pvStructure = pvStructure;
|
||||
m_bitSet = bitSet;
|
||||
}
|
||||
|
||||
virtual void getDone(epics::pvData::Status *status)
|
||||
{
|
||||
std::cout << "getDone(" << status->toString() << ")" << std::endl;
|
||||
String str;
|
||||
m_pvStructure->toString(&str);
|
||||
std::cout << str;
|
||||
std::cout << std::endl;
|
||||
}
|
||||
|
||||
virtual void putDone(epics::pvData::Status *status)
|
||||
{
|
||||
std::cout << "putDone(" << status->toString() << ")" << std::endl;
|
||||
String str;
|
||||
m_pvStructure->toString(&str);
|
||||
std::cout << str;
|
||||
std::cout << std::endl;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
|
||||
class MonitorRequesterImpl : public MonitorRequester
|
||||
{
|
||||
virtual String getRequesterName()
|
||||
{
|
||||
return "MonitorRequesterImpl";
|
||||
};
|
||||
|
||||
virtual void message(String message,MessageType messageType)
|
||||
{
|
||||
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
|
||||
}
|
||||
|
||||
virtual void monitorConnect(Status* status, Monitor* monitor, Structure* structure)
|
||||
{
|
||||
std::cout << "monitorConnect(" << status->toString() << ")" << std::endl;
|
||||
if (structure)
|
||||
{
|
||||
String str;
|
||||
structure->toString(&str);
|
||||
std::cout << str << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
virtual void monitorEvent(Monitor* monitor)
|
||||
{
|
||||
std::cout << "monitorEvent" << std::endl;
|
||||
|
||||
MonitorElement* element = monitor->poll();
|
||||
|
||||
String str("changed/overrun ");
|
||||
element->getChangedBitSet()->toString(&str);
|
||||
str += '/';
|
||||
element->getOverrunBitSet()->toString(&str);
|
||||
str += '\n';
|
||||
element->getPVStructure()->toString(&str);
|
||||
std::cout << str << std::endl;
|
||||
|
||||
monitor->release(element);
|
||||
}
|
||||
|
||||
virtual void unlisten(Monitor* monitor)
|
||||
{
|
||||
std::cout << "unlisten" << std::endl;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
int main(int argc,char *argv[])
|
||||
{
|
||||
MockClientContext* context = new MockClientContext();
|
||||
@@ -435,8 +875,32 @@ int main(int argc,char *argv[])
|
||||
GetFieldRequesterImpl getFieldRequesterImpl;
|
||||
channel->getField(&getFieldRequesterImpl, "timeStamp.secondsPastEpoch");
|
||||
|
||||
channel->destroy();
|
||||
ChannelGetRequesterImpl channelGetRequesterImpl;
|
||||
ChannelGet* channelGet = channel->createChannelGet(&channelGetRequesterImpl, 0);
|
||||
channelGet->get(false);
|
||||
channelGet->destroy();
|
||||
|
||||
ChannelPutRequesterImpl channelPutRequesterImpl;
|
||||
ChannelPut* channelPut = channel->createChannelPut(&channelPutRequesterImpl, 0);
|
||||
channelPut->get();
|
||||
channelPut->put(false);
|
||||
channelPut->destroy();
|
||||
|
||||
|
||||
MonitorRequesterImpl monitorRequesterImpl;
|
||||
Monitor* monitor = channel->createMonitor(&monitorRequesterImpl, 0);
|
||||
|
||||
Status* status = monitor->start();
|
||||
std::cout << "monitor->start() = " << status->toString() << std::endl;
|
||||
delete status;
|
||||
|
||||
status = monitor->stop();
|
||||
std::cout << "monitor->stop() = " << status->toString() << std::endl;
|
||||
delete status;
|
||||
|
||||
monitor->destroy();
|
||||
|
||||
channel->destroy();
|
||||
|
||||
context->destroy();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user