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

removed spaces at end of line

Browse Source
This commit is contained in:
zimoch
2020-04-15 13:08:37 +02:00
committed by mdavidsaver
parent 40300a12cb
commit 3ba6679e67
23 changed files with 52 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/ca/caChannel.cpp
View File

@ -162,7 +162,7 @@ void CAChannel::activate(short priority)
CAChannel::~CAChannel()
{
if(DEBUG_LEVEL>0) {
cout << "CAChannel::~CAChannel() " << channelName
cout << "CAChannel::~CAChannel() " << channelName
<< " channelCreated " << (channelCreated ? "true" : "false")
<< endl;
}
@ -177,7 +177,7 @@ void CAChannel::disconnectChannel()
{
if(DEBUG_LEVEL>0) {
cout << "CAChannel::disconnectChannel() "
<< channelName
<< channelName
<< " channelCreated " << (channelCreated ? "true" : "false")
<< endl;
}
@ -285,7 +285,7 @@ ChannelGet::shared_pointer CAChannel::createChannelGet(
if(DEBUG_LEVEL>0) {
cout << "CAChannel::createChannelGet " << channelName << endl;
}
CAChannelGetPtr channelGet =
CAChannelGetPtr channelGet =
CAChannelGet::create(shared_from_this(), channelGetRequester, pvRequest);
{
Lock lock(requestsMutex);
@ -306,7 +306,7 @@ ChannelPut::shared_pointer CAChannel::createChannelPut(
if(DEBUG_LEVEL>0) {
cout << "CAChannel::createChannelPut " << channelName << endl;
}
CAChannelPutPtr channelPut =
CAChannelPutPtr channelPut =
CAChannelPut::create(shared_from_this(), channelPutRequester, pvRequest);
{
Lock lock(requestsMutex);
@ -327,7 +327,7 @@ Monitor::shared_pointer CAChannel::createMonitor(
if(DEBUG_LEVEL>0) {
cout << "CAChannel::createMonitor " << channelName << endl;
}
CAChannelMonitorPtr channelMonitor =
CAChannelMonitorPtr channelMonitor =
CAChannelMonitor::create(shared_from_this(), monitorRequester, pvRequest);
{
Lock lock(requestsMutex);
@ -496,10 +496,10 @@ static void ca_get_handler(struct event_handler_args args)
void CAChannelGet::getDone(struct event_handler_args &args)
{
if(DEBUG_LEVEL>1) {
std::cout << "CAChannelGet::getDone "
std::cout << "CAChannelGet::getDone "
<< channel->getChannelName() << endl;
}
ChannelGetRequester::shared_pointer getRequester(channelGetRequester.lock());
if(!getRequester) return;
getStatus = dbdToPv->getFromDBD(pvStructure,bitSet,args);
@ -640,7 +640,7 @@ void CAChannelPut::put(PVStructure::shared_pointer const & pvPutStructure,
ChannelPutRequester::shared_pointer putRequester(channelPutRequester.lock());
if(!putRequester) return;
{
Lock lock(mutex);
Lock lock(mutex);
isPut = true;
}
putStatus = dbdToPv->putToDBD(channel,pvPutStructure,block,&ca_put_handler,this);
@ -671,7 +671,7 @@ void CAChannelPut::getDone(struct event_handler_args &args)
if(DEBUG_LEVEL>1) {
cout << "CAChannelPut::getDone " << channel->getChannelName() << endl;
}
ChannelPutRequester::shared_pointer putRequester(channelPutRequester.lock());
if(!putRequester) return;
getStatus = dbdToPv->getFromDBD(pvStructure,bitSet,args);
@ -698,7 +698,7 @@ void CAChannelPut::get()
ChannelPutRequester::shared_pointer putRequester(channelPutRequester.lock());
if(!putRequester) return;
{
Lock lock(mutex);
Lock lock(mutex);
isPut = false;
}
@ -753,7 +753,7 @@ private:
size_t queueSize;
bool isStarted;
Mutex mutex;
std::queue<MonitorElementPtr> monitorElementQueue;
public:
CACMonitorQueue(
@ -763,7 +763,7 @@ public:
{}
~CACMonitorQueue()
{
}
}
void start()
{
Lock guard(mutex);
@ -784,7 +784,7 @@ public:
Lock guard(mutex);
if(!isStarted) return false;
if(monitorElementQueue.size()==queueSize) return false;
PVStructure::shared_pointer pvs =
PVStructure::shared_pointer pvs =
getPVDataCreate()->createPVStructure(pvStructure);
MonitorElementPtr monitorElement(new MonitorElement(pvs));
*(monitorElement->changedBitSet) = *(activeElement->changedBitSet);
@ -826,7 +826,7 @@ CAChannelMonitorPtr CAChannelMonitor::create(
CAChannelMonitor::CAChannelMonitor(
CAChannel::shared_pointer const & channel,
MonitorRequester::shared_pointer const & monitorRequester,
PVStructurePtr const & pvRequest)
PVStructurePtr const & pvRequest)
:
channel(channel),
monitorRequester(monitorRequester),
@ -896,7 +896,7 @@ void CAChannelMonitor::subscriptionEvent(struct event_handler_args &args)
<< channel->getChannelName() << endl;
}
{
Lock lock(mutex);
Lock lock(mutex);
if(!isStarted) return;
}
MonitorRequester::shared_pointer requester(monitorRequester.lock());
@ -975,7 +975,7 @@ Status CAChannelMonitor::stop()
{
Lock lock(mutex);
if(!isStarted) return Status(Status::STATUSTYPE_WARNING,"already stopped");
isStarted = false;
isStarted = false;
}
monitorQueue->stop();
int result = ca_clear_subscription(pevid);

5
src/ca/caProvider.cpp
View File

@ -32,7 +32,7 @@ using namespace epics::pvData;
catch (std::exception &e) { LOG(logLevelError, "Unhandled exception caught from client code at %s:%d: %s", __FILE__, __LINE__, e.what()); } \
catch (...) { LOG(logLevelError, "Unhandled exception caught from client code at %s:%d.", __FILE__, __LINE__); }
CAChannelProvider::CAChannelProvider()
CAChannelProvider::CAChannelProvider()
: current_context(0)
{
initialize();
@ -73,7 +73,7 @@ CAChannelProvider::~CAChannelProvider()
std::cout << "~CAChannelProvider() calling disconnectChannel "
<< channelQ.front()->getChannelName()
<< std::endl;
}
}
channelQ.front()->disconnectChannel();
channelQ.pop();
}
@ -218,4 +218,3 @@ void CAClientFactory::stop()
}
}}}

4
src/ca/channelConnectThread.cpp
View File

@ -50,7 +50,7 @@ void ChannelConnectThread::start()
"channelConnectThread",
epicsThreadGetStackSize(epicsThreadStackSmall),
epicsThreadPriorityLow));
thread->start();
thread->start();
}
@ -67,7 +67,7 @@ void ChannelConnectThread::stop()
void ChannelConnectThread::channelConnected(
NotifyChannelRequesterPtr const &notifyChannelRequester)
{
{
{
Lock lock(mutex);
if(notifyChannelRequester->isOnQueue) return;
notifyChannelRequester->isOnQueue = true;

26
src/ca/dbdToPv.cpp
View File

@ -147,7 +147,7 @@ void DbdToPv::activate(
string mess(caChannel->getChannelName());
mess += " DbdToPv::activate pvRequest is null";
throw std::runtime_error(mess);
}
}
PVStructurePtr fieldPVStructure;
if(pvRequest->getPVFields().size()==0) {
fieldPVStructure = pvRequest;
@ -159,8 +159,8 @@ void DbdToPv::activate(
mess << caChannel->getChannelName()
<< " DbdToPv::activate illegal pvRequest " << pvRequest;
throw std::runtime_error(mess.str());
}
if(fieldPVStructure->getPVFields().size()==0)
}
if(fieldPVStructure->getPVFields().size()==0)
{
valueRequested = true;
alarmRequested = true;
@ -308,7 +308,7 @@ void DbdToPv::activate(
caRequestType = caValueType;
if(displayRequested || controlRequested || valueAlarmRequested)
{
caRequestType = dbf_type_to_DBR_CTRL(caValueType);
caRequestType = dbf_type_to_DBR_CTRL(caValueType);
} else if(timeStampRequested || alarmRequested) {
caRequestType = dbf_type_to_DBR_TIME(caValueType);
} else {
@ -350,7 +350,7 @@ void DbdToPv::getChoicesDone(struct event_handler_args &args)
choices.reserve(num);
for(size_t i=0; i<num; ++i) choices.push_back(string(&dbr_enum_p->strs[i][0]));
choicesEvent.signal();
}
}
void DbdToPv::getChoices(CAChannelPtr const & caChannel)
@ -522,7 +522,7 @@ Status DbdToPv::getFromDBD(
ConvertPtr convert = getConvert();
size_t n = choices.size();
pvChoices->setLength(n);
convert->fromStringArray(pvChoices,0,n,choices,0);
convert->fromStringArray(pvChoices,0,n,choices,0);
bitSet->set(pvStructure->getSubField("value")->getFieldOffset());
} else {
bitSet->set(value->getFieldOffset());
@ -552,7 +552,7 @@ Status DbdToPv::getFromDBD(
}
copy_DBRScalar<dbr_long_t,PVInt>(value,pvValue); break;
case DBR_FLOAT: copy_DBRScalar<dbr_float_t,PVFloat>(value,pvValue); break;
case DBR_DOUBLE:
case DBR_DOUBLE:
if(dbfIsINT64)
{
copy_DBRScalar<dbr_double_t,PVLong>(value,pvValue);
@ -575,7 +575,7 @@ Status DbdToPv::getFromDBD(
}
}
if(alarmRequested) {
// Note that status and severity are aways the first two members of DBR_
// Note that status and severity are aways the first two members of DBR_
const dbr_sts_string *data = static_cast<const dbr_sts_string *>(args.dbr);
dbr_short_t status = data->status;
dbr_short_t severity = data->severity;
@ -927,21 +927,21 @@ Status DbdToPv::putToDBD(
break;
}
case DBR_STRING: pValue = pvStructure->getSubField<PVString>("value")->get().c_str(); break;
case DBR_CHAR:
case DBR_CHAR:
if(dbfIsUCHAR)
{
pValue = put_DBRScalar<dbr_char_t,PVUByte>(&bvalue,pvValue);
break;
}
pValue = put_DBRScalar<dbr_char_t,PVByte>(&bvalue,pvValue); break;
case DBR_SHORT:
case DBR_SHORT:
if(dbfIsUSHORT)
{
pValue = put_DBRScalar<dbr_short_t,PVUShort>(&svalue,pvValue);
break;
}
pValue = put_DBRScalar<dbr_short_t,PVShort>(&svalue,pvValue); break;
case DBR_LONG:
case DBR_LONG:
if(dbfIsULONG)
{
pValue = put_DBRScalar<dbr_long_t,PVUInt>(&lvalue,pvValue);
@ -949,7 +949,7 @@ Status DbdToPv::putToDBD(
}
pValue = put_DBRScalar<dbr_long_t,PVInt>(&lvalue,pvValue); break;
case DBR_FLOAT: pValue = put_DBRScalar<dbr_float_t,PVFloat>(&fvalue,pvValue); break;
case DBR_DOUBLE:
case DBR_DOUBLE:
if(dbfIsINT64)
{
pValue = put_DBRScalar<dbr_double_t,PVLong>(&dvalue,pvValue);
@ -982,6 +982,6 @@ Status DbdToPv::putToDBD(
}
if(ca_stringBuffer!=NULL) delete[] ca_stringBuffer;
return status;
}
}
}}}

4
src/ca/getDoneThread.cpp
View File

@ -50,7 +50,7 @@ void GetDoneThread::start()
"getDoneThread",
epicsThreadGetStackSize(epicsThreadStackBig),
epicsThreadPriorityLow));
thread->start();
thread->start();
}
@ -66,7 +66,7 @@ void GetDoneThread::stop()
void GetDoneThread::getDone(NotifyGetRequesterPtr const &notifyGetRequester)
{
{
{
Lock lock(mutex);
if(notifyGetRequester->isOnQueue) return;
notifyGetRequester->isOnQueue = true;

4
src/ca/monitorEventThread.cpp
View File

@ -49,7 +49,7 @@ void MonitorEventThread::start()
"monitorEventThread",
epicsThreadGetStackSize(epicsThreadStackBig),
epicsThreadPriorityLow));
thread->start();
thread->start();
}
void MonitorEventThread::stop()
@ -65,7 +65,7 @@ void MonitorEventThread::stop()
void MonitorEventThread::event(NotifyMonitorRequesterPtr const &notifyMonitorRequester)
{
{
{
Lock lock(mutex);
if(notifyMonitorRequester->isOnQueue) return;
notifyMonitorRequester->isOnQueue = true;

4
src/ca/putDoneThread.cpp
View File

@ -50,7 +50,7 @@ void PutDoneThread::start()
"putDoneThread",
epicsThreadGetStackSize(epicsThreadStackBig),
epicsThreadPriorityLow));
thread->start();
thread->start();
}
@ -66,7 +66,7 @@ void PutDoneThread::stop()
void PutDoneThread::putDone(NotifyPutRequesterPtr const &notifyPutRequester)
{
{
{
Lock lock(mutex);
if(notifyPutRequester->isOnQueue) return;
notifyPutRequester->isOnQueue = true;

1
src/factory/ChannelAccessFactory.cpp
View File

@ -267,4 +267,3 @@ ChannelProvider::createChannel(std::string const & name,
}
}

1
src/remote/beaconHandler.cpp
View File

@ -84,4 +84,3 @@ bool BeaconHandler::updateBeacon(int8 /*remoteTransportRevision*/, TimeStamp* /*
}
}

1
src/remote/channelSearchManager.cpp
View File

@ -392,4 +392,3 @@ void ChannelSearchManager::timerStopped()
}
}

2
src/remote/serializationHelper.cpp
View File

@ -96,5 +96,3 @@ void SerializationHelper::serializeFull(ByteBuffer* buffer, SerializableControl*
}
}

1
src/remote/transportRegistry.cpp
View File

@ -174,4 +174,3 @@ void TransportRegistry::toArray(transportVector_t & transportArray, const osiSoc
}
}

1
src/remoteClient/clientContextImpl.cpp
View File

@ -4761,4 +4761,3 @@ ChannelProvider::shared_pointer createClientProvider(const Configuration::shared
}
};

1
src/server/beaconEmitter.cpp
View File

@ -135,4 +135,3 @@ void BeaconEmitter::callback()
}
}

1
src/server/beaconServerStatusProvider.cpp
View File

@ -35,4 +35,3 @@ PVField::shared_pointer DefaultBeaconServerStatusProvider::getServerStatusData()
}
}

2
src/server/responseHandlers.cpp
View File

@ -453,7 +453,7 @@ void ServerChannelFindRequesterImpl::channelFindResult(const Status& /*status*/,
_context->s_channelNameToProvider[_name] = channelFind->getChannelProvider();
}
_wasFound = wasFound;
BlockingUDPTransport::shared_pointer bt = _context->getBroadcastTransport();
if (bt)
{

1
src/utils/configuration.cpp
View File

@ -257,4 +257,3 @@ ConfigurationProvider::shared_pointer ConfigurationFactory::getProvider()
}
}

1
src/utils/introspectionRegistry.cpp
View File

@ -141,4 +141,3 @@ FieldConstPtr IntrospectionRegistry::deserialize(ByteBuffer* buffer, Deserializa
}
}

1
src/utils/referenceCountingLock.cpp
View File

@ -98,4 +98,3 @@ int ReferenceCountingLock::decrement()
}
}

1
testApp/remote/testADCSim.cpp
View File

@ -366,4 +366,3 @@ SimADC::smart_pointer_type getSimADC(const std::string& name)
return it->second;
}

3
testApp/utils/configurationTest.cpp
View File

@ -145,6 +145,3 @@ MAIN(configurationTest)
testConfig();
return testDone();
}

1
testApp/utils/testInetAddressUtils.cpp
View File

@ -314,4 +314,3 @@ MAIN(testInetAddressUtils)
return testDone();
}

25
testCa/testCaProvider.cpp
View File

@ -173,7 +173,7 @@ private:
TestChannelGetRequesterPtr const &getRequester,
TestChannelPtr const &testChannel,
PVStructurePtr const & pvRequest);
TestChannelGetRequesterWPtr getRequester;
TestChannelPtr testChannel;
PVStructurePtr pvRequest;
@ -293,7 +293,7 @@ private:
TestChannelPut(
TestChannelPutRequesterPtr const &putRequester,
TestChannelPtr const &testChannel);
TestChannelPutRequesterWPtr putRequester;
TestChannelPtr testChannel;
PVStructurePtr pvStructure;
@ -362,7 +362,7 @@ void TestChannelPut::connect()
{
string request("value");
PVStructurePtr pvRequest(createRequest(request));
channelPut = testChannel->getChannel()->createChannelPut(shared_from_this(),pvRequest);
if(!channelPut) throw std::runtime_error(testChannel->getChannelName() + " channelCreate failed ");
}
@ -370,7 +370,7 @@ void TestChannelPut::connect()
void TestChannelPut::waitConnect(double timeout)
{
if(waitForConnect.wait(timeout)) return;
throw std::runtime_error(testChannel->getChannelName()
throw std::runtime_error(testChannel->getChannelName()
+ " TestChannelPut::waitConnect failed ");
}
@ -378,7 +378,7 @@ void TestChannelPut::waitConnect(double timeout)
void TestChannelPut::put(string const & value)
{
PVFieldPtr pvField(pvStructure->getSubField("value"));
if(!pvField) throw std::runtime_error(testChannel->getChannelName()
if(!pvField) throw std::runtime_error(testChannel->getChannelName()
+ " TestChannelPut::put no value ");
FieldConstPtr field(pvField->getField());
Type type(field->getType());
@ -403,10 +403,10 @@ void TestChannelPut::put(string const & value)
}
values.push_back(value.substr(pos,offset-pos));
pos = offset+1;
n++;
n++;
}
pvScalarArray->setLength(n);
getConvert()->fromStringArray(pvScalarArray,0,n,values,0);
getConvert()->fromStringArray(pvScalarArray,0,n,values,0);
bitSet->set(pvField->getFieldOffset());
channelPut->put(pvStructure,bitSet);
return;
@ -420,7 +420,7 @@ void TestChannelPut::put(string const & value)
return;
}
}
throw std::runtime_error(testChannel->getChannelName()
throw std::runtime_error(testChannel->getChannelName()
+ " TestChannelPut::put not supported type");
}
@ -465,7 +465,7 @@ private:
TestChannelMonitorRequesterPtr const &putRequester,
TestChannelPtr const &testChannel,
PVStructurePtr const & pvRequest);
TestChannelMonitorRequesterWPtr monitorRequester;
TestChannelPtr testChannel;
PVStructurePtr pvRequest;
@ -503,7 +503,7 @@ void TestChannelMonitor::monitorConnect(
{
waitForConnect.signal();
}
void TestChannelMonitor::monitorEvent(MonitorPtr const & monitor)
{
@ -722,7 +722,7 @@ void TestIoc::start()
"testIoc",
epicsThreadGetStackSize(epicsThreadStackBig),
epicsThreadPriorityLow));
thread->start();
thread->start();
#endif
}
@ -768,7 +768,7 @@ MAIN(testCaProvider)
testPlan(143 + EXIT_TESTS);
TestIocPtr testIoc(new TestIoc());
testIoc->start();
testIoc->start();
testDiag("===Test caProvider===");
CAClientFactory::start();
@ -819,4 +819,3 @@ MAIN(testCaProvider)
return testDone();;
}