From 62e0495c3d122dafb71a41510e4d9203158e168e Mon Sep 17 00:00:00 2001
From: Matej Sekoranja <unknown>
Date: Wed, 26 Jan 2011 00:00:38 +0100
Subject: [PATCH] structure equals fix

---
 configure/RELEASE                  |  2 +-
 pvDataApp/factory/Convert.cpp      |  4 ++--
 testApp/misc/testSerialization.cpp | 26 +++++++++++++++++---------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/configure/RELEASE b/configure/RELEASE
index 37d8c6d..a30496c 100644
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -22,7 +22,7 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
 #SNCSEQ=$(EPICS_BASE)/../modules/soft/seq
 
 # EPICS_BASE usually appears last so other apps can override stuff:
-EPICS_BASE=/home/install/epics/base
+EPICS_BASE=/opt/epics/base
 
 #Capfast users may need the following definitions
 #CAPFAST_TEMPLATES=
diff --git a/pvDataApp/factory/Convert.cpp b/pvDataApp/factory/Convert.cpp
index d3981c3..7868f0c 100644
--- a/pvDataApp/factory/Convert.cpp
+++ b/pvDataApp/factory/Convert.cpp
@@ -1467,7 +1467,7 @@ static bool structureArrayEquals(PVStructureArray *a,PVStructureArray *b)
         } else {
             if(bArray[i]==0) return false;
         }
-        if(aArray[i]!=bArray[i]) return false;
+        if(*aArray[i]!=*bArray[i]) return false;
     }
     return true;
 }
@@ -1481,7 +1481,7 @@ static bool structureEquals(PVStructure *a,PVStructure *b)
     PVFieldPtrArray aFields = a->getPVFields();
     PVFieldPtrArray bFields = b->getPVFields();
     for(int i=0; i<length; i++) {
-        if(aFields[i]!=bFields[i]) return false;
+        if(*aFields[i]!=*bFields[i]) return false;
     }
     return true;
 }
diff --git a/testApp/misc/testSerialization.cpp b/testApp/misc/testSerialization.cpp
index d8635f8..29999b1 100644
--- a/testApp/misc/testSerialization.cpp
+++ b/testApp/misc/testSerialization.cpp
@@ -18,6 +18,7 @@
 #include "serialize.h"
 #include "noDefaultMethods.h"
 #include "byteBuffer.h"
+#include "showConstructDestruct.h"
 
 #define BYTE_MAX_VALUE 127
 #define BYTE_MIN_VALUE -128
@@ -83,6 +84,7 @@ void serializationTest(PVField* field) {
     buffer->flip();
 
     // create new instance and deserialize
+    field->getField()->incReferenceCount();
     PVField* deserializedField = getPVDataCreate()->createPVField(NULL,
             field->getField());
     deserializedField->deserialize(buffer, control);
@@ -408,7 +410,7 @@ void testScalarEquals() {
     delete scalar2;
 
     FieldCreate* fieldCreate = getFieldCreate();
-    FieldConstPtr fields[2];
+    FieldConstPtrArray fields = new FieldConstPtr[2];
     fields[0] = fieldCreate->createScalar("secondsSinceEpoch",
             epics::pvData::pvLong);
     fields[1] = fieldCreate->createScalar("nanoSeconds", epics::pvData::pvInt);
@@ -416,6 +418,7 @@ void testScalarEquals() {
             fields);
 
     PVStructure* pvStruct1 = factory->createPVStructure(NULL, structure);
+    structure->incReferenceCount();
     PVStructure* pvStruct2 = factory->createPVStructure(NULL, structure);
     assert((*pvStruct1)==(*pvStruct2));
     delete pvStruct2;
@@ -466,7 +469,7 @@ void testScalarNonInitialized() {
     delete scalar;
 
     FieldCreate* fieldCreate = getFieldCreate();
-    FieldConstPtr fields[2];
+    FieldConstPtrArray fields = new FieldConstPtr[2];
     fields[0] = fieldCreate->createScalar("secondsSinceEpoch",
             epics::pvData::pvLong);
     fields[1] = fieldCreate->createScalar("nanoSeconds", epics::pvData::pvInt);
@@ -528,7 +531,7 @@ void testArrayNonInitialized() {
     delete array;
 
     FieldCreate* fieldCreate = getFieldCreate();
-    FieldConstPtr fields[2];
+    FieldConstPtrArray fields = new FieldConstPtr[2];
     fields[0] = fieldCreate->createScalar("secondsSinceEpoch",
             epics::pvData::pvLong);
     fields[1] = fieldCreate->createScalar("nanoSeconds", epics::pvData::pvInt);
@@ -556,7 +559,7 @@ void testStructure() {
     assert(pvDataCreate!=NULL);
 
     cout<<"\tSimple structure serialization\n";
-    FieldConstPtr fields[2];
+    FieldConstPtrArray fields = new FieldConstPtr[2];
     fields[0] = fieldCreate->createScalar("secondsSinceEpoch",
             epics::pvData::pvLong);
     fields[1] = fieldCreate->createScalar("nanoSeconds", epics::pvData::pvInt);
@@ -567,14 +570,18 @@ void testStructure() {
 
     serializationTest(pvStructure);
     //serializationTest(pvStructure->getStructure());
+    delete pvStructure;
 
     cout<<"\tComplex structure serialization\n";
     // and more complex :)
-    FieldConstPtr fields2[4];
+    FieldConstPtrArray fields2 = new FieldConstPtr[4];
     fields2[0] = fieldCreate->createScalar("longVal", epics::pvData::pvLong);
     fields2[1] = fieldCreate->createScalar("intVal", epics::pvData::pvInt);
     fields2[2] = fieldCreate->createScalarArray("values", epics::pvData::pvDouble);
-    fields2[3] = fieldCreate->createStructure("timeStamp", 2, fields);
+    FieldConstPtrArray fields3 = new FieldConstPtr[2];
+    fields3[0] = fieldCreate->createScalar("secondsSinceEpoch", epics::pvData::pvLong);
+    fields3[1] = fieldCreate->createScalar("nanoSeconds", epics::pvData::pvInt);
+    fields2[3] = fieldCreate->createStructure("timeStamp", 2, fields3);
     PVStructure* pvStructure2 = pvDataCreate->createPVStructure(NULL,
             "complexStructure", 4, fields2);
     pvStructure2->getLongField(fields2[0]->getFieldName())->put(1234);
@@ -586,13 +593,13 @@ void testStructure() {
 
     PVStructure* ps = pvStructure2->getStructureField(
             fields2[3]->getFieldName());
-    ps->getLongField(fields[0]->getFieldName())->put(789);
-    ps->getIntField(fields[1]->getFieldName())->put(1011);
+    ps->getLongField(fields3[0]->getFieldName())->put(789);
+    ps->getIntField(fields3[1]->getFieldName())->put(1011);
 
     serializationTest(pvStructure2);
     //serializationTest(pvStructure2->getStructure());
     delete pvStructure2;
-    delete pvStructure;
+
 
     cout<<"!!!  PASSED\n\n";
 }
@@ -632,6 +639,7 @@ int main(int argc, char *argv[]) {
     delete control;
     delete flusher;
 
+    getShowConstructDestruct()->showDeleteStaticExit(stdout);
     cout<<"\nDone!\n";
 
     return (0);