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

minor changes

Browse Source
This commit is contained in:
Marty Kraimer
2013-06-17 07:49:55 -04:00
parent ea0e2cd570
commit a39bef15bb
9 changed files with 52 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/pvCopy/testPVCopy.cpp
View File

@@ -194,15 +194,18 @@ static void testPVScalarArray(
BitSetPtr bitSet;
String builder;
size_t offset;
ConvertPtr convert = getConvert();
size_t n = 5;
shared_vector<double> values(n);
DoubleArray values(n);
// shared_vector<double> values(n);
pvRecord->lock_guard();
cout << endl;
pvStructureRecord = pvRecord->getPVRecordStructure()->getPVStructure();
pvValueRecord = pvStructureRecord->getScalarArrayField(valueNameRecord,scalarType);
for(size_t i=0; i<n; i++) values[i] = i;
pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
convert->fromDoubleArray(pvValueRecord,0,n,get(values),0);
// pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
StructureConstPtr structure = pvCopy->getStructure();
builder.clear(); structure->toString(&builder);
cout << "structure from copy" << endl << builder << endl;
@@ -214,7 +217,8 @@ static void testPVScalarArray(
cout << "after initCopy pvValueCopy " << builder << endl;
cout << endl;
for(size_t i=0; i<n; i++) values[i] = i + .06;
pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
convert->fromDoubleArray(pvValueRecord,0,n,get(values),0);
// pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
pvCopy->updateCopySetBitSet(pvStructureCopy,bitSet,true);
builder.clear(); pvValueCopy->toString(&builder);
cout << "after put(i+ .06) pvValueCopy " << builder << endl;
@@ -233,7 +237,8 @@ static void testPVScalarArray(
cout << endl;
bitSet->clear();
for(size_t i=0; i<n; i++) values[i] = i + 1.0;
pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
convert->fromDoubleArray(pvValueRecord,0,n,get(values),0);
// pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
builder.clear();
bitSet->toString(&builder);
cout << "before updateCopyFromBitSet";
@@ -257,7 +262,8 @@ static void testPVScalarArray(
cout << " bitSet " << builder;
cout << endl;
for(size_t i=0; i<n; i++) values[i] = i + 2.0;
pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
convert->fromDoubleArray(pvValueRecord,0,n,get(values),0);
// pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
bitSet->set(0);
cout << "before updateRecord";
builder.clear(); pvValueRecord->toString(&builder);

2
test/server/exampleCounterMain.cpp
View File

@@ -22,6 +22,7 @@
#include <pv/standardPVField.h>
#include <pv/exampleCounter.h>
#include <pv/channelProviderLocal.h>
#include <pv/serverContext.h>
using namespace std;
using std::tr1::static_pointer_cast;
@@ -39,6 +40,7 @@ int main(int argc,char *argv[])
bool result = master->addRecord(pvRecord);
cout << "result of addRecord " << recordName << " " << result << endl;
pvRecord.reset();
startPVAServer(PVACCESS_ALL_PROVIDERS,0,true,true);
cout << "exampleServer\n";
string str;
while(true) {

7
test/server/testExampleServerMain.cpp
View File

@@ -24,6 +24,7 @@
#include <pv/powerSupplyRecordTest.h>
#include <pv/channelProviderLocal.h>
#include <pv/recordList.h>
#include <pv/serverContext.h>
using namespace std;
using std::tr1::static_pointer_cast;
@@ -83,6 +84,7 @@ int main(int argc,char *argv[])
pvRecord->process();
}
result = master->addRecord(pvRecord);
if(!result) cout<< "record " << recordName << " not added" << endl;
recordName = "exampleDoubleArray";
pvStructure = standardPVField->scalarArray(scalarType,properties);
pvRecord = PVRecord::create(recordName,pvStructure);
@@ -91,6 +93,7 @@ int main(int argc,char *argv[])
pvRecord->process();
}
result = master->addRecord(pvRecord);
if(!result) cout<< "record " << recordName << " not added" << endl;
recordName = "examplePowerSupply";
pvStructure = createPowerSupply();
PowerSupplyRecordTestPtr psr =
@@ -101,8 +104,11 @@ int main(int argc,char *argv[])
}
result = master->addRecord(psr);
recordName = "laptoprecordListPGRPC";
if(!result) cout<< "record " << recordName << " not added" << endl;
pvRecord = RecordListRecord::create(recordName);
result = master->addRecord(pvRecord);
ServerContext::shared_pointer ctx =
startPVAServer(PVACCESS_ALL_PROVIDERS,0,true,true);
cout << "exampleServer\n";
PVStringArrayPtr pvNames = master->getRecordNames();
String buffer;
@@ -115,6 +121,7 @@ int main(int argc,char *argv[])
if(str.compare("exit")==0) break;
}
ctx->destroy();
return 0;
}