general indent beautification

This commit is contained in:
Matej Sekoranja
2016-03-10 23:36:16 +01:00
parent d139c42d17
commit 5279d247ca
110 changed files with 21778 additions and 21525 deletions

View File

@@ -18,8 +18,8 @@ using std::string;
class ChannelFindRequesterImpl : public ChannelFindRequester
{
virtual void channelFindResult(const epics::pvData::Status& status,
ChannelFind::shared_pointer const & /*channelFind*/,
bool wasFound)
ChannelFind::shared_pointer const & /*channelFind*/,
bool wasFound)
{
std::cout << "[ChannelFindRequesterImpl] channelFindResult("
<< status << ", ..., " << wasFound << ")" << std::endl;
@@ -77,8 +77,8 @@ class GetFieldRequesterImpl : public GetFieldRequester
class ChannelGetRequesterImpl : public ChannelGetRequester
{
public:
public:
virtual string getRequesterName()
{
return "ChannelGetRequesterImpl";
@@ -100,7 +100,7 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
}
virtual void getDone(const epics::pvData::Status& status, ChannelGet::shared_pointer const &,
PVStructure::shared_pointer const & getData, BitSet::shared_pointer const & /*bitSet*/)
PVStructure::shared_pointer const & getData, BitSet::shared_pointer const & /*bitSet*/)
{
std::cout << "getDone(" << status << ")" << std::endl;
@@ -113,8 +113,8 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
class ChannelPutRequesterImpl : public ChannelPutRequester
{
public:
public:
virtual string getRequesterName()
{
return "ChannelPutRequesterImpl";
@@ -136,7 +136,7 @@ class ChannelPutRequesterImpl : public ChannelPutRequester
}
virtual void getDone(const epics::pvData::Status& status, ChannelPut::shared_pointer const &,
PVStructure::shared_pointer const & getData, BitSet::shared_pointer const & /*bitSet*/)
PVStructure::shared_pointer const & getData, BitSet::shared_pointer const & /*bitSet*/)
{
std::cout << "getDone(" << status << ")" << std::endl;
if (status.isSuccess())
@@ -154,7 +154,7 @@ class ChannelPutRequesterImpl : public ChannelPutRequester
class ChannelPutGetRequesterImpl : public ChannelPutGetRequester
{
public:
public:
virtual string getRequesterName()
{
@@ -183,7 +183,7 @@ class ChannelPutGetRequesterImpl : public ChannelPutGetRequester
}
virtual void getGetDone(const epics::pvData::Status& status, ChannelPutGet::shared_pointer const &,
PVStructure::shared_pointer const & getData, BitSet::shared_pointer const & /*bitSet*/)
PVStructure::shared_pointer const & getData, BitSet::shared_pointer const & /*bitSet*/)
{
std::cout << "getGetDone(" << status << ")" << std::endl;
if (status.isSuccess())
@@ -193,7 +193,7 @@ class ChannelPutGetRequesterImpl : public ChannelPutGetRequester
}
virtual void getPutDone(const epics::pvData::Status& status, ChannelPutGet::shared_pointer const &,
PVStructure::shared_pointer const & putData, BitSet::shared_pointer const & /*bitSet*/)
PVStructure::shared_pointer const & putData, BitSet::shared_pointer const & /*bitSet*/)
{
std::cout << "getPutDone(" << status << ")" << std::endl;
if (status.isSuccess())
@@ -203,7 +203,7 @@ class ChannelPutGetRequesterImpl : public ChannelPutGetRequester
}
virtual void putGetDone(const epics::pvData::Status& status, ChannelPutGet::shared_pointer const &,
PVStructure::shared_pointer const & putData, BitSet::shared_pointer const & /*bitSet*/)
PVStructure::shared_pointer const & putData, BitSet::shared_pointer const & /*bitSet*/)
{
std::cout << "putGetDone(" << status << ")" << std::endl;
if (status.isSuccess())
@@ -228,13 +228,13 @@ class ChannelRPCRequesterImpl : public ChannelRPCRequester
}
virtual void channelRPCConnect(const epics::pvData::Status& status,
ChannelRPC::shared_pointer const & /*channelRPC*/)
ChannelRPC::shared_pointer const & /*channelRPC*/)
{
std::cout << "channelRPCConnect(" << status << ")" << std::endl;
}
virtual void requestDone(const epics::pvData::Status& status, ChannelRPC::shared_pointer const &,
epics::pvData::PVStructure::shared_pointer const & pvResponse)
epics::pvData::PVStructure::shared_pointer const & pvResponse)
{
std::cout << "requestDone(" << status << ")" << std::endl;
if (status.isSuccess())
@@ -246,8 +246,8 @@ class ChannelRPCRequesterImpl : public ChannelRPCRequester
class ChannelArrayRequesterImpl : public ChannelArrayRequester
{
public:
public:
virtual string getRequesterName()
{
return "ChannelArrayRequesterImpl";
@@ -266,11 +266,11 @@ class ChannelArrayRequesterImpl : public ChannelArrayRequester
{
std::cout << array << std::endl;
}
}
virtual void getArrayDone(const epics::pvData::Status& status, ChannelArray::shared_pointer const &,
PVArray::shared_pointer const & pvArray)
PVArray::shared_pointer const & pvArray)
{
std::cout << "getArrayDone(" << status << ")" << std::endl;
if (status.isSuccess())
@@ -290,7 +290,7 @@ class ChannelArrayRequesterImpl : public ChannelArrayRequester
}
virtual void getLengthDone(const epics::pvData::Status& status, ChannelArray::shared_pointer const &,
size_t length)
size_t length)
{
std::cout << "getLengthDone(" << status << "," << length << ")" << std::endl;
}
@@ -309,7 +309,7 @@ class MonitorRequesterImpl : public MonitorRequester
}
virtual void monitorConnect(const epics::pvData::Status& status,
Monitor::shared_pointer const & /*monitor*/, StructureConstPtr const & structure)
Monitor::shared_pointer const & /*monitor*/, StructureConstPtr const & structure)
{
std::cout << "monitorConnect(" << status << ")" << std::endl;
if (status.isSuccess() && structure)
@@ -325,7 +325,7 @@ class MonitorRequesterImpl : public MonitorRequester
MonitorElement::shared_pointer element = monitor->poll();
std::cout << "changed/overrun " << *element->changedBitSet << '/' <<
*element->overrunBitSet << std::endl << *element->pvStructurePtr << std::endl;
*element->overrunBitSet << std::endl << *element->pvStructurePtr << std::endl;
monitor->release(element);
}
@@ -352,7 +352,7 @@ class ChannelProcessRequesterImpl : public ChannelProcessRequester
}
virtual void channelProcessConnect(const epics::pvData::Status& status,
ChannelProcess::shared_pointer const & /*channelProcess*/)
ChannelProcess::shared_pointer const & /*channelProcess*/)
{
std::cout << "channelProcessConnect(" << status << ")" << std::endl;
@@ -370,144 +370,147 @@ class ChannelProcessRequesterImpl : public ChannelProcessRequester
int main()
{
for (int i = 0; i < 10; i++) {
{
ClientFactory::start();
ChannelProvider::shared_pointer provider = getChannelProviderRegistry()->getProvider("pva");
{
ChannelFindRequester::shared_pointer findRequester(new ChannelFindRequesterImpl());
ChannelFind::shared_pointer channelFind = provider->channelFind("testSomething", findRequester);
epicsThreadSleep ( SLEEP_TIME );
//channelFind->destroy();
ClientFactory::start();
ChannelProvider::shared_pointer provider = getChannelProviderRegistry()->getProvider("pva");
ChannelFindRequester::shared_pointer findRequester(new ChannelFindRequesterImpl());
ChannelFind::shared_pointer channelFind = provider->channelFind("testSomething", findRequester);
epicsThreadSleep ( SLEEP_TIME );
//channelFind->destroy();
ChannelRequester::shared_pointer channelRequester(new ChannelRequesterImpl());
Channel::shared_pointer channel = provider->createChannel("testStructureArrayTest", channelRequester);
epicsThreadSleep ( SLEEP_TIME );
channel->printInfo();
{
GetFieldRequester::shared_pointer getFieldRequesterImpl(new GetFieldRequesterImpl());
channel->getField(getFieldRequesterImpl, "");
epicsThreadSleep ( SLEEP_TIME );
}
{
ChannelProcessRequester::shared_pointer channelProcessRequester(new ChannelProcessRequesterImpl());
PVStructure::shared_pointer pvRequest;
ChannelProcess::shared_pointer channelProcess = channel->createChannelProcess(channelProcessRequester, pvRequest);
epicsThreadSleep ( SLEEP_TIME );
channelProcess->process();
epicsThreadSleep ( SLEEP_TIME );
channelProcess->destroy();
epicsThreadSleep ( SLEEP_TIME );
}
{
ChannelGetRequester::shared_pointer channelGetRequesterImpl(new ChannelGetRequesterImpl());
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest("field()");
ChannelGet::shared_pointer channelGet = channel->createChannelGet(channelGetRequesterImpl, pvRequest);
epicsThreadSleep ( 3.0 );
channelGet->get();
epicsThreadSleep ( 3.0 );
channelGet->destroy();
}
{
ChannelPutRequester::shared_pointer channelPutRequesterImpl(new ChannelPutRequesterImpl());
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest("field(value,timeStamp)");
ChannelPut::shared_pointer channelPut = channel->createChannelPut(channelPutRequesterImpl, pvRequest);
epicsThreadSleep ( SLEEP_TIME );
channelPut->get();
epicsThreadSleep ( SLEEP_TIME );
// TODO !!!
//channelPut->put();
//epicsThreadSleep ( SLEEP_TIME );
channelPut->destroy();
}
{
ChannelPutGetRequester::shared_pointer channelPutGetRequesterImpl(new ChannelPutGetRequesterImpl());
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest("putField(value,timeStamp)getField(timeStamp)");
ChannelPutGet::shared_pointer channelPutGet = channel->createChannelPutGet(channelPutGetRequesterImpl, pvRequest);
epicsThreadSleep ( SLEEP_TIME );
channelPutGet->getGet();
epicsThreadSleep ( SLEEP_TIME );
channelPutGet->getPut();
epicsThreadSleep ( SLEEP_TIME );
// TODO !!!
//channelPutGet->putGet();
//epicsThreadSleep ( SLEEP_TIME );
channelPutGet->destroy();
}
{
ChannelRPCRequester::shared_pointer channelRPCRequesterImpl(new ChannelRPCRequesterImpl());
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest("record[]field(arguments)");
ChannelRPC::shared_pointer channelRPC = channel->createChannelRPC(channelRPCRequesterImpl, pvRequest);
epicsThreadSleep ( SLEEP_TIME );
// for test simply use pvRequest as arguments
channelRPC->request(pvRequest);
epicsThreadSleep ( SLEEP_TIME );
channelRPC->destroy();
}
{
ChannelArrayRequester::shared_pointer channelArrayRequesterImpl(new ChannelArrayRequesterImpl());
StringArray fieldNames;
fieldNames.push_back("field");
FieldConstPtrArray fields;
fields.push_back(getFieldCreate()->createScalar(pvString));
PVStructure::shared_pointer pvRequest(getPVDataCreate()->createPVStructure(getFieldCreate()->createStructure(fieldNames, fields)));
ChannelArray::shared_pointer channelArray = channel->createChannelArray(channelArrayRequesterImpl, pvRequest);
epicsThreadSleep ( SLEEP_TIME );
channelArray->getArray(0,0,1);
epicsThreadSleep ( SLEEP_TIME );
// TODO !!!
//channelArray->putArray(0,0,1);
//epicsThreadSleep ( SLEEP_TIME );
channelArray->setLength(3);
epicsThreadSleep ( SLEEP_TIME );
channelArray->getLength();
epicsThreadSleep ( SLEEP_TIME );
channelArray->destroy();
}
{
MonitorRequester::shared_pointer monitorRequesterImpl(new MonitorRequesterImpl());
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest("field()");
Monitor::shared_pointer monitor = channel->createMonitor(monitorRequesterImpl, pvRequest);
epicsThreadSleep( SLEEP_TIME );
Status status = monitor->start();
std::cout << "monitor->start() = " << status << std::endl;
epicsThreadSleep( 3*SLEEP_TIME );
status = monitor->stop();
std::cout << "monitor->stop() = " << status << std::endl;
monitor->destroy();
}
epicsThreadSleep ( 3*SLEEP_TIME );
printf("Destroying channel... \n");
channel->destroy();
printf("done.\n");
epicsThreadSleep ( 3*SLEEP_TIME );
ChannelRequester::shared_pointer channelRequester(new ChannelRequesterImpl());
Channel::shared_pointer channel = provider->createChannel("testStructureArrayTest", channelRequester);
epicsThreadSleep ( SLEEP_TIME );
channel->printInfo();
{
GetFieldRequester::shared_pointer getFieldRequesterImpl(new GetFieldRequesterImpl());
channel->getField(getFieldRequesterImpl, "");
epicsThreadSleep ( SLEEP_TIME );
}
{
ChannelProcessRequester::shared_pointer channelProcessRequester(new ChannelProcessRequesterImpl());
PVStructure::shared_pointer pvRequest;
ChannelProcess::shared_pointer channelProcess = channel->createChannelProcess(channelProcessRequester, pvRequest);
epicsThreadSleep ( SLEEP_TIME );
channelProcess->process();
epicsThreadSleep ( SLEEP_TIME );
channelProcess->destroy();
epicsThreadSleep ( SLEEP_TIME );
}
{
ChannelGetRequester::shared_pointer channelGetRequesterImpl(new ChannelGetRequesterImpl());
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest("field()");
ChannelGet::shared_pointer channelGet = channel->createChannelGet(channelGetRequesterImpl, pvRequest);
epicsThreadSleep ( 3.0 );
channelGet->get();
epicsThreadSleep ( 3.0 );
channelGet->destroy();
}
{
ChannelPutRequester::shared_pointer channelPutRequesterImpl(new ChannelPutRequesterImpl());
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest("field(value,timeStamp)");
ChannelPut::shared_pointer channelPut = channel->createChannelPut(channelPutRequesterImpl, pvRequest);
epicsThreadSleep ( SLEEP_TIME );
channelPut->get();
epicsThreadSleep ( SLEEP_TIME );
// TODO !!!
//channelPut->put();
//epicsThreadSleep ( SLEEP_TIME );
channelPut->destroy();
}
{
ChannelPutGetRequester::shared_pointer channelPutGetRequesterImpl(new ChannelPutGetRequesterImpl());
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest("putField(value,timeStamp)getField(timeStamp)");
ChannelPutGet::shared_pointer channelPutGet = channel->createChannelPutGet(channelPutGetRequesterImpl, pvRequest);
epicsThreadSleep ( SLEEP_TIME );
channelPutGet->getGet();
epicsThreadSleep ( SLEEP_TIME );
channelPutGet->getPut();
epicsThreadSleep ( SLEEP_TIME );
// TODO !!!
//channelPutGet->putGet();
//epicsThreadSleep ( SLEEP_TIME );
channelPutGet->destroy();
}
ClientFactory::stop();
{
ChannelRPCRequester::shared_pointer channelRPCRequesterImpl(new ChannelRPCRequesterImpl());
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest("record[]field(arguments)");
ChannelRPC::shared_pointer channelRPC = channel->createChannelRPC(channelRPCRequesterImpl, pvRequest);
epicsThreadSleep ( SLEEP_TIME );
// for test simply use pvRequest as arguments
channelRPC->request(pvRequest);
epicsThreadSleep ( SLEEP_TIME );
channelRPC->destroy();
}
{
ChannelArrayRequester::shared_pointer channelArrayRequesterImpl(new ChannelArrayRequesterImpl());
StringArray fieldNames; fieldNames.push_back("field");
FieldConstPtrArray fields; fields.push_back(getFieldCreate()->createScalar(pvString));
PVStructure::shared_pointer pvRequest(getPVDataCreate()->createPVStructure(getFieldCreate()->createStructure(fieldNames, fields)));
/*
printf("Destroying context... \n");
context->destroy();
printf("done.\n");
*/
ChannelArray::shared_pointer channelArray = channel->createChannelArray(channelArrayRequesterImpl, pvRequest);
epicsThreadSleep ( SLEEP_TIME );
channelArray->getArray(0,0,1);
epicsThreadSleep ( SLEEP_TIME );
// TODO !!!
//channelArray->putArray(0,0,1);
//epicsThreadSleep ( SLEEP_TIME );
channelArray->setLength(3);
epicsThreadSleep ( SLEEP_TIME );
channelArray->getLength();
epicsThreadSleep ( SLEEP_TIME );
channelArray->destroy();
}
{
MonitorRequester::shared_pointer monitorRequesterImpl(new MonitorRequesterImpl());
PVStructure::shared_pointer pvRequest = CreateRequest::create()->createRequest("field()");
Monitor::shared_pointer monitor = channel->createMonitor(monitorRequesterImpl, pvRequest);
epicsThreadSleep( SLEEP_TIME );
Status status = monitor->start();
std::cout << "monitor->start() = " << status << std::endl;
epicsThreadSleep( 3*SLEEP_TIME );
status = monitor->stop();
std::cout << "monitor->stop() = " << status << std::endl;
monitor->destroy();
}
epicsThreadSleep ( 3*SLEEP_TIME );
printf("Destroying channel... \n");
channel->destroy();
printf("done.\n");
epicsThreadSleep ( 3*SLEEP_TIME );
epicsThreadSleep ( SLEEP_TIME );
}
ClientFactory::stop();
/*
printf("Destroying context... \n");
context->destroy();
printf("done.\n");
*/
epicsThreadSleep ( SLEEP_TIME ); }
//std::cout << "-----------------------------------------------------------------------" << std::endl;
//epicsExitCallAtExits();
return(0);