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

needed clone instead of copy

Browse Source
This commit is contained in:
Marty Kraimer
2015-03-20 16:28:33 -04:00
parent 8f054db6cd
commit 6a351cb5a2
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/easyNTMultiChannel.cpp
View File

@@ -155,8 +155,7 @@ NTMultiChannelPtr EasyNTMultiChannel::get()
userTag.resize(numChannel);
userTagExists = true;
}
valueVector.resize(numChannel);
shared_vector<PVUnionPtr> valueVector(numChannel);
for(size_t i=0; i<numChannel; ++i)
{
easyGet[i]->issueGet();
@@ -177,7 +176,7 @@ NTMultiChannelPtr EasyNTMultiChannel::get()
UnionConstPtr u = pvUnionArray->getUnionArray()->getUnion();
if(u->isVariant()) {
PVUnionPtr pvUnion = pvDataCreate->createPVVariantUnion();
pvUnion->set(pvField);
pvUnion->set(pvDataCreate->createPVField(pvField));
valueVector[i] = pvUnion;
} else {
PVUnionPtr pvUnion = pvDataCreate->createPVUnion(u);
@@ -242,10 +241,16 @@ void EasyNTMultiChannel::put(NTMultiChannelPtr const &value)
try {
PVFieldPtr pvFrom = valueVector[i]->get();
PVFieldPtr pvTo = easyPut[i]->getData()->getValue();
pvTo->copy(*pvFrom);
Type typeFrom = pvFrom->getField()->getType();
Type typeTo = pvTo->getField()->getType();
if(typeFrom==typeTo) {
if(typeFrom==scalar || typeFrom==scalarArray) {
pvTo->copy(*pvFrom);
}
}
easyPut[i]->issuePut();
} catch (std::exception e) {
string message = channelNames[i] + e.what();
string message = channelNames[i] + " " + e.what();
throw std::runtime_error(message);
}
}

1
src/easyNTMultiChannel.h
View File

@@ -84,7 +84,6 @@ private:
epics::pvData::PVDataCreatePtr pvDataCreate;
std::vector<EasyGetPtr> easyGet;
std::vector<EasyPutPtr> easyPut;
epics::pvData::shared_vector<epics::pvData::PVUnionPtr> valueVector;
epics::pvData::shared_vector<epics::pvData::int32> severity;
epics::pvData::shared_vector<epics::pvData::int32> status;
epics::pvData::shared_vector<std::string> message;

4
test/src/testEasyNTMultiChannel.cpp
View File

@@ -54,10 +54,10 @@ static void testGood(EasyPVAPtr const &easyPVA)
EasyNTMultiChannelPtr easy = EasyNTMultiChannel::create(
easyPVA,pvNames,structure);
NTMultiChannelPtr nt = easy->get();
cout << "initial\n" << nt->getPVStructure() << endl;
for(size_t numtimes=0; numtimes<3; ++numtimes) {
PVUnionArrayPtr pvValue = nt->getPVStructure()->
getSubField<PVUnionArray>("value");
cout << "initial\n" << nt->getPVStructure() << endl;
shared_vector<PVUnionPtr> valueVector = pvValue->reuse();
for(size_t i=0; i<num; ++i)
{
@@ -111,8 +111,8 @@ static void testGood(EasyPVAPtr const &easyPVA)
pvValue->replace(freeze(valueVector));
easy->put(nt);
nt = easy->get();
cout << "after put\n" << nt->getPVStructure() << endl;
}
cout << "final\n" << nt->getPVStructure() << endl;
} catch (std::runtime_error e) {
cout << "exception " << e.what() << endl;
isOk = false;