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

fixed memory leak in Convert. Cleaned up test/testProperty

Browse Source
This commit is contained in:
Marty Kraimer
2011-02-10 04:56:39 -05:00
parent 277c71c7de
commit de19e4b4dc
5 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pvDataApp/factory/Convert.cpp
View File

@@ -621,6 +621,7 @@ void Convert::copyStructureArray(
toArray = structureArrayData.data;
for(int i=0; i<length; i++) {
if(fromArray[i]==0) {
if(toArray[i]!=0) delete toArray[i];
toArray[i] = 0;
} else {
if(toArray[i]==0) {

1
test/testAll.sh
View File

@@ -16,3 +16,4 @@
./testQueue.sh || exit $?
./testMessageQueue.sh || exit $?
./testSerialization.sh || exit $?
./testProperty.sh || exit $?

34
test/testProperty
View File

@@ -1,19 +1,19 @@
structure value
double value 0
structure alarm
alarm alarm
int severity 0
string message
structure timeStamp
timeStamp timeStamp
long secondsPastEpoch 0
int nanoSeconds 0
structure display
display display
string description
string format
string units
structure limit
double low 0
double high 0
structure control
control control
structure limit
double low 0
double high 0
@@ -21,11 +21,11 @@ structure value
structure value
structure value
int index 0
stringArray choices [0,1,2,3]
structure alarm
string[] choices [0,1,2,3]
alarm alarm
int severity 0
string message
structure timeStamp
timeStamp timeStamp
long secondsPastEpoch 0
int nanoSeconds 0
testAlarm
@@ -41,20 +41,20 @@ index 2 choice 2
doubleRecord
structure value
double value 0
structure alarm
alarm alarm
int severity 2
string message testMessage
structure timeStamp
timeStamp timeStamp
long secondsPastEpoch 0
int nanoSeconds 0
structure display
display display
string description testDescription
string format %f10.0
string units volts
structure limit
double low -10
double high -1
structure control
control control
structure limit
double low 1
double high 10
@@ -63,14 +63,12 @@ enumeratedRecord
structure value
structure value
int index 2
stringArray choices [0,1,2,3]
structure alarm
string[] choices [0,1,2,3]
alarm alarm
int severity 0
string message
structure timeStamp
timeStamp timeStamp
long secondsPastEpoch 0
int nanoSeconds 0
linkedListNode: totalConstruct 5 totalDestruct 0
linkedList: totalConstruct 1 totalDestruct 0
field: totalConstruct 127 totalDestruct 34 totalReference 93
pvField: totalConstruct 30 totalDestruct 30
pvField: totalConstruct 30 totalDestruct 30
field: totalConstruct 99 totalDestruct 99

2
test/testPropertyAux
View File

@@ -1 +1 @@
2010.12.07 14:16:00 824222648 nanoSeconds isDst false
2011.02.10 04:50:12 195472034 nanoSeconds isDst false

34
test/testPropertyGold
View File

@@ -1,19 +1,19 @@
structure value
double value 0
structure alarm
alarm alarm
int severity 0
string message
structure timeStamp
timeStamp timeStamp
long secondsPastEpoch 0
int nanoSeconds 0
structure display
display display
string description
string format
string units
structure limit
double low 0
double high 0
structure control
control control
structure limit
double low 0
double high 0
@@ -21,11 +21,11 @@ structure value
structure value
structure value
int index 0
stringArray choices [0,1,2,3]
structure alarm
string[] choices [0,1,2,3]
alarm alarm
int severity 0
string message
structure timeStamp
timeStamp timeStamp
long secondsPastEpoch 0
int nanoSeconds 0
testAlarm
@@ -41,20 +41,20 @@ index 2 choice 2
doubleRecord
structure value
double value 0
structure alarm
alarm alarm
int severity 2
string message testMessage
structure timeStamp
timeStamp timeStamp
long secondsPastEpoch 0
int nanoSeconds 0
structure display
display display
string description testDescription
string format %f10.0
string units volts
structure limit
double low -10
double high -1
structure control
control control
structure limit
double low 1
double high 10
@@ -63,14 +63,12 @@ enumeratedRecord
structure value
structure value
int index 2
stringArray choices [0,1,2,3]
structure alarm
string[] choices [0,1,2,3]
alarm alarm
int severity 0
string message
structure timeStamp
timeStamp timeStamp
long secondsPastEpoch 0
int nanoSeconds 0
linkedListNode: totalConstruct 5 totalDestruct 0
linkedList: totalConstruct 1 totalDestruct 0
field: totalConstruct 127 totalDestruct 34 totalReference 93
pvField: totalConstruct 30 totalDestruct 30
pvField: totalConstruct 30 totalDestruct 30
field: totalConstruct 99 totalDestruct 99