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

unsigned/size_t/shared ptrs

Browse Source
This commit is contained in:
Matej Sekoranja
2012-06-15 14:47:16 +02:00
parent 7307529f7f
commit 4b5bc38835
31 changed files with 742 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
testApp/remote/pvput.cpp
View File

@@ -121,13 +121,11 @@ void convertToString(StringBuilder buffer,PVField * pv,int notFirst)
void convertStructure(StringBuilder buffer,PVStructure *data,int notFirst)
{
PVFieldPtrArray fieldsData = data->getPVFields();
if (fieldsData != 0) {
int length = data->getStructure()->getNumberFields();
for(int i=0; i<length; i++) {
PVField *fieldField = fieldsData[i];
convertToString(buffer,fieldField,notFirst + 1);
}
}
int length = data->getStructure()->getNumberFields();
for(int i=0; i<length; i++) {
PVFieldPtr fieldField = fieldsData[i];
convertToString(buffer,fieldField.get(),notFirst + 1);
}
}
void convertArray(StringBuilder buffer,PVScalarArray * pv,int notFirst)
@@ -139,9 +137,9 @@ void convertArray(StringBuilder buffer,PVScalarArray * pv,int notFirst)
PVBooleanArray *pvdata = static_cast<PVBooleanArray*>(pv);
BooleanArrayData data = BooleanArrayData();
*buffer += "[";
for(int i=0; i < pvdata->getLength(); i++) {
for(size_t i=0; i < pvdata->getLength(); i++) {
if(i!=0) *buffer += ",";
int num = pvdata->get(i,1,&data);
int num = pvdata->get(i,1,data);
if(num==1) {
BooleanArray value = data.data;
if(value[data.offset]) {
@@ -160,9 +158,9 @@ void convertArray(StringBuilder buffer,PVScalarArray * pv,int notFirst)
PVByteArray *pvdata = static_cast<PVByteArray*>(pv);
ByteArrayData data = ByteArrayData();
*buffer += "[";
for(int i=0; i < pvdata->getLength(); i++) {
for(size_t i=0; i < pvdata->getLength(); i++) {
if(i!=0) *buffer += ",";
int num = pvdata->get(i,1,&data);
int num = pvdata->get(i,1,data);
if(num==1) {
int val = data.data[data.offset];
char buf[16];
@@ -179,9 +177,9 @@ void convertArray(StringBuilder buffer,PVScalarArray * pv,int notFirst)
PVShortArray *pvdata = static_cast<PVShortArray*>(pv);
ShortArrayData data = ShortArrayData();
*buffer += "[";
for(int i=0; i < pvdata->getLength(); i++) {
for(size_t i=0; i < pvdata->getLength(); i++) {
if(i!=0) *buffer += ',';
int num = pvdata->get(i,1,&data);
int num = pvdata->get(i,1,data);
if(num==1) {
int val = data.data[data.offset];
char buf[16];
@@ -198,9 +196,9 @@ void convertArray(StringBuilder buffer,PVScalarArray * pv,int notFirst)
PVIntArray *pvdata = static_cast<PVIntArray*>(pv);
IntArrayData data = IntArrayData();
*buffer += "[";
for(int i=0; i < pvdata->getLength(); i++) {
for(size_t i=0; i < pvdata->getLength(); i++) {
if(i!=0) *buffer += ',';
int num = pvdata->get(i,1,&data);
int num = pvdata->get(i,1,data);
if(num==1) {
int val = data.data[data.offset];
char buf[16];
@@ -217,9 +215,9 @@ void convertArray(StringBuilder buffer,PVScalarArray * pv,int notFirst)
PVLongArray *pvdata = static_cast<PVLongArray*>(pv);
LongArrayData data = LongArrayData();
*buffer += "[";
for(int i=0; i < pvdata->getLength(); i++) {
for(size_t i=0; i < pvdata->getLength(); i++) {
if(i!=0) *buffer += ',';
int num = pvdata->get(i,1,&data);
int num = pvdata->get(i,1,data);
if(num==1) {
int64 val = data.data[data.offset];
char buf[16];
@@ -236,9 +234,9 @@ void convertArray(StringBuilder buffer,PVScalarArray * pv,int notFirst)
PVFloatArray *pvdata = static_cast<PVFloatArray*>(pv);
FloatArrayData data = FloatArrayData();
*buffer += "[";
for(int i=0; i < pvdata->getLength(); i++) {
for(size_t i=0; i < pvdata->getLength(); i++) {
if(i!=0) *buffer += ',';
int num = pvdata->get(i,1,&data);
int num = pvdata->get(i,1,data);
if(num==1) {
float val = data.data[data.offset];
char buf[16];
@@ -255,9 +253,9 @@ void convertArray(StringBuilder buffer,PVScalarArray * pv,int notFirst)
PVDoubleArray *pvdata = static_cast<PVDoubleArray*>(pv);
DoubleArrayData data = DoubleArrayData();
*buffer += "[";
for(int i=0; i < pvdata->getLength(); i++) {
for(size_t i=0; i < pvdata->getLength(); i++) {
if(i!=0) *buffer += ',';
int num = pvdata->get(i,1,&data);
int num = pvdata->get(i,1,data);
if(num==1) {
double val = data.data[data.offset];
char buf[16];
@@ -274,9 +272,9 @@ void convertArray(StringBuilder buffer,PVScalarArray * pv,int notFirst)
PVStringArray *pvdata = static_cast<PVStringArray*>(pv);
StringArrayData data = StringArrayData();
*buffer += "[";
for(int i=0; i < pvdata->getLength(); i++) {
for(size_t i=0; i < pvdata->getLength(); i++) {
if(i!=0) *buffer += ",";
int num = pvdata->get(i,1,&data);
int num = pvdata->get(i,1,data);
StringArray value = data.data;
if(num==1) {
if(value[data.offset].length()>0) {
@@ -304,13 +302,13 @@ void convertStructureArray(StringBuilder buffer,
return;
}
StructureArrayData data = StructureArrayData();
pvdata->get(0, length, &data);
pvdata->get(0, length, data);
for (int i = 0; i < length; i++) {
PVStructure *pvStructure = data.data[i];
PVStructurePtr pvStructure = data.data[i];
if (pvStructure == 0) {
*buffer += "null";
} else {
convertToString(buffer,pvStructure,notFirst+1);
convertToString(buffer,pvStructure.get(),notFirst+1);
}
}
}
@@ -378,7 +376,7 @@ class ChannelPutRequesterImpl : public ChannelPutRequester
virtual void message(String message,MessageType messageType)
{
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
}
virtual void channelPutConnect(const epics::pvData::Status& status,ChannelPut::shared_pointer const & channelPut,
@@ -485,7 +483,7 @@ public:
virtual void message(String message,MessageType messageType)
{
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl;
}
virtual void channelCreated(const epics::pvData::Status& status, Channel::shared_pointer const & channel)
@@ -635,7 +633,7 @@ int main (int argc, char *argv[])
allOK &= putRequesterImpl->waitUntilDone(timeOut);
if (allOK)
{
getConvert()->fromString(putRequesterImpl->getStructure().get(), values);
getConvert()->fromString(putRequesterImpl->getStructure(), values);
putRequesterImpl->resetEvent();
channelPut->put(false);