From 1db56f4b292afd140dfc035a50556eff8345b795 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Thu, 19 Jul 2012 16:08:11 -0400 Subject: [PATCH] fix bug in unsigned standardField; missing const in pvIntrospect.h --- pvDataApp/factory/StandardField.cpp | 17 +- pvDataApp/pv/pvIntrospect.h | 2 +- pvDataApp/pv/standardField.h | 4 + test/testAll.sh | 1 - test/testBaseException | 8 +- test/testBaseExceptionDiff | 10 +- test/testBitSet | 1 - test/testBitSetDiff | 6 + test/testIntrospectDiff | 4 +- test/testLinkedList.sh | 33 --- test/testLinkedListGold | 21 -- test/testMessageQueueDiff | 2 +- test/testPVAppend | 6 + test/testPVAppendDiff | 10 +- test/testPVAuxInfoDiff | 2 +- test/testPVData | 6 +- test/testPVDataDiff | 14 +- test/testPVStructureArray | 260 ++++++++++++++++++++- test/testPVStructureArrayDiff | 337 +++++++++++++--------------- test/testPropertyAux | 2 +- test/testPropertyDiff | 2 +- test/testQueueDiff | 2 +- test/testThread | 8 +- test/testThreadAux | 2 +- test/testThreadDiff | 14 ++ test/testTimeStampAux | 8 +- test/testTimer | 5 - test/testTimerAux | 66 +++++- test/testTimerDiff | 8 + 29 files changed, 565 insertions(+), 296 deletions(-) delete mode 100755 test/testLinkedList.sh delete mode 100644 test/testLinkedListGold diff --git a/pvDataApp/factory/StandardField.cpp b/pvDataApp/factory/StandardField.cpp index ecc8fa9..3cddd1b 100644 --- a/pvDataApp/factory/StandardField.cpp +++ b/pvDataApp/factory/StandardField.cpp @@ -560,12 +560,22 @@ StructureConstPtr StandardField::byteAlarm() return byteAlarmField; } +StructureConstPtr StandardField::ubyteAlarm() +{ + return ubyteAlarmField; +} + StructureConstPtr StandardField::shortAlarm() { return shortAlarmField; } -StructureConstPtr StandardField::intAlarm() +StructureConstPtr StandardField::ushortAlarm() +{ + return shortAlarmField; +} + +StructureConstPtr StandardField::uintAlarm() { return intAlarmField; } @@ -575,6 +585,11 @@ StructureConstPtr StandardField::longAlarm() return longAlarmField; } +StructureConstPtr StandardField::ulongAlarm() +{ + return ulongAlarmField; +} + StructureConstPtr StandardField::floatAlarm() { return floatAlarmField; diff --git a/pvDataApp/pv/pvIntrospect.h b/pvDataApp/pv/pvIntrospect.h index 88535fb..38383dc 100644 --- a/pvDataApp/pv/pvIntrospect.h +++ b/pvDataApp/pv/pvIntrospect.h @@ -394,7 +394,7 @@ public: * @return The introspection interface. * This will hold a null pointer if the field is not in the structure. */ - FieldConstPtr getField(std::size_t index) {return fields[index];} + FieldConstPtr getField(std::size_t index) const {return fields[index];} /** * Get the field index for the specified fieldName. * @return The introspection interface. diff --git a/pvDataApp/pv/standardField.h b/pvDataApp/pv/standardField.h index 990a64e..193bf27 100644 --- a/pvDataApp/pv/standardField.h +++ b/pvDataApp/pv/standardField.h @@ -66,9 +66,13 @@ public: StructureConstPtr control(); StructureConstPtr booleanAlarm(); StructureConstPtr byteAlarm(); + StructureConstPtr ubyteAlarm(); StructureConstPtr shortAlarm(); + StructureConstPtr ushortAlarm(); StructureConstPtr intAlarm(); + StructureConstPtr uintAlarm(); StructureConstPtr longAlarm(); + StructureConstPtr ulongAlarm(); StructureConstPtr floatAlarm(); StructureConstPtr doubleAlarm(); StructureConstPtr enumeratedAlarm(); diff --git a/test/testAll.sh b/test/testAll.sh index 6a40d4a..c7ec374 100755 --- a/test/testAll.sh +++ b/test/testAll.sh @@ -3,7 +3,6 @@ ./testBaseException.sh || exit $? ./testPVType.sh || exit $? ./testThread.sh || exit $? -./testLinkedList.sh || exit $? ./testBitSet.sh || exit $? ./testByteBuffer.sh || exit $? ./testIntrospect.sh || exit $? diff --git a/test/testBaseException b/test/testBaseException index ab762bc..215bdea 100644 --- a/test/testBaseException +++ b/test/testBaseException @@ -5,7 +5,7 @@ There is a logic_error On line 68 of ../testBaseException.cpp ../bin/linux-x86_64/testBaseException[0x401abb] ../bin/linux-x86_64/testBaseException[0x4014b4] -/lib64/libc.so.6(__libc_start_main+0xed)[0x366dc2169d] +/lib64/libc.so.6(__libc_start_main+0xed)[0x300ea2169d] ../bin/linux-x86_64/testBaseException[0x40150d] To translate run 'addr2line -e execname 0xXXXXXXX ...' Note: Must be compiled with debug symbols @@ -16,7 +16,7 @@ There is another logic_error On line 75 of ../testBaseException.cpp ../bin/linux-x86_64/testBaseException() [0x401c79] ../bin/linux-x86_64/testBaseException() [0x4014b4] -/lib64/libc.so.6(__libc_start_main+0xed) [0x366dc2169d] +/lib64/libc.so.6(__libc_start_main+0xed) [0x300ea2169d] ../bin/linux-x86_64/testBaseException() [0x40150d] testBaseException... @@ -25,7 +25,7 @@ all is OK On line 48 of ../testBaseException.cpp ../bin/linux-x86_64/testBaseException() [0x401859] ../bin/linux-x86_64/testBaseException() [0x4014bc] -/lib64/libc.so.6(__libc_start_main+0xed) [0x366dc2169d] +/lib64/libc.so.6(__libc_start_main+0xed) [0x300ea2169d] ../bin/linux-x86_64/testBaseException() [0x40150d] @@ -37,7 +37,7 @@ On line 57 of ../testBaseException.cpp ../bin/linux-x86_64/testBaseException() [0x40162c] ../bin/linux-x86_64/testBaseException() [0x401a10] ../bin/linux-x86_64/testBaseException() [0x4014bc] -/lib64/libc.so.6(__libc_start_main+0xed) [0x366dc2169d] +/lib64/libc.so.6(__libc_start_main+0xed) [0x300ea2169d] ../bin/linux-x86_64/testBaseException() [0x40150d] diff --git a/test/testBaseExceptionDiff b/test/testBaseExceptionDiff index 11e95e6..b23e11a 100644 --- a/test/testBaseExceptionDiff +++ b/test/testBaseExceptionDiff @@ -1,5 +1,5 @@ --- testBaseExceptionGold 2012-01-21 13:09:44.864000461 -0500 -+++ testBaseException 2012-05-17 09:13:19.055289804 -0400 ++++ testBaseException 2012-07-19 16:06:11.418991443 -0400 @@ -1,37 +1,45 @@ + + @@ -8,7 +8,7 @@ +On line 68 of ../testBaseException.cpp +../bin/linux-x86_64/testBaseException[0x401abb] +../bin/linux-x86_64/testBaseException[0x4014b4] -+/lib64/libc.so.6(__libc_start_main+0xed)[0x366dc2169d] ++/lib64/libc.so.6(__libc_start_main+0xed)[0x300ea2169d] +../bin/linux-x86_64/testBaseException[0x40150d] +To translate run 'addr2line -e execname 0xXXXXXXX ...' + Note: Must be compiled with debug symbols @@ -19,7 +19,7 @@ +On line 75 of ../testBaseException.cpp +../bin/linux-x86_64/testBaseException() [0x401c79] +../bin/linux-x86_64/testBaseException() [0x4014b4] -+/lib64/libc.so.6(__libc_start_main+0xed) [0x366dc2169d] ++/lib64/libc.so.6(__libc_start_main+0xed) [0x300ea2169d] +../bin/linux-x86_64/testBaseException() [0x40150d] + testBaseException... @@ -33,7 +33,7 @@ +On line 48 of ../testBaseException.cpp +../bin/linux-x86_64/testBaseException() [0x401859] +../bin/linux-x86_64/testBaseException() [0x4014bc] -+/lib64/libc.so.6(__libc_start_main+0xed) [0x366dc2169d] ++/lib64/libc.so.6(__libc_start_main+0xed) [0x300ea2169d] +../bin/linux-x86_64/testBaseException() [0x40150d] + @@ -66,7 +66,7 @@ +../bin/linux-x86_64/testBaseException() [0x40162c] +../bin/linux-x86_64/testBaseException() [0x401a10] +../bin/linux-x86_64/testBaseException() [0x4014bc] -+/lib64/libc.so.6(__libc_start_main+0xed) [0x366dc2169d] ++/lib64/libc.so.6(__libc_start_main+0xed) [0x300ea2169d] +../bin/linux-x86_64/testBaseException() [0x40150d] + diff --git a/test/testBitSet b/test/testBitSet index b7bdd44..2589bb5 100644 --- a/test/testBitSet +++ b/test/testBitSet @@ -1,3 +1,2 @@ testGetSetClearFlip... PASSED testOperators... PASSED -bitSet: totalConstruct 4 totalDestruct 4 diff --git a/test/testBitSetDiff b/test/testBitSetDiff index e69de29..1ff0734 100644 --- a/test/testBitSetDiff +++ b/test/testBitSetDiff @@ -0,0 +1,6 @@ +--- testBitSetGold 2012-01-21 13:09:45.106001921 -0500 ++++ testBitSet 2012-07-19 16:06:14.839021851 -0400 +@@ -1,3 +1,2 @@ + testGetSetClearFlip... PASSED + testOperators... PASSED +-bitSet: totalConstruct 4 totalDestruct 4 diff --git a/test/testIntrospectDiff b/test/testIntrospectDiff index 680c0f7..1500651 100644 --- a/test/testIntrospectDiff +++ b/test/testIntrospectDiff @@ -1,5 +1,5 @@ ---- testIntrospectGold 2012-01-21 13:09:45.325003244 -0500 -+++ testIntrospect 2012-05-17 09:13:21.483308181 -0400 +--- testIntrospectGold 2012-07-19 16:05:15.355492987 -0400 ++++ testIntrospect 2012-07-19 16:06:14.880022214 -0400 @@ -1,26 +1,26 @@ testScalar diff --git a/test/testLinkedList.sh b/test/testLinkedList.sh deleted file mode 100755 index 5d1254b..0000000 --- a/test/testLinkedList.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -SELF="`basename "$0"`" -TEST="${SELF%.sh}" - -if [ -z "$EPICS_HOST_ARCH" ]; then - echo "Please set EPICS_HOST_ARCH and run again" - exit 1 -fi - -rm -f $TEST ${TEST}Diff ${TEST}Aux - -if ../bin/${EPICS_HOST_ARCH}/$TEST $TEST ${TEST}Aux 2>&1 >/dev/null -then - printf "" # OK -else - printf "$TEST Failed to complete\n" -fi - -if [ -e $TEST -a -e ${TEST}Gold ] -then - diff -u ${TEST}Gold $TEST >> ${TEST}Diff - if [ -s "${TEST}Diff" ] - then - printf "$TEST Does not match expectations\n" - cat ${TEST}Diff - printf "\n\n" - else - printf "$TEST OK\n" - fi -else - printf "$TEST OK\n" -fi diff --git a/test/testLinkedListGold b/test/testLinkedListGold deleted file mode 100644 index af50c54..0000000 --- a/test/testLinkedListGold +++ /dev/null @@ -1,21 +0,0 @@ -basic addTail 0 1 2 3 4 4 3 2 1 0 -basic addHead 0 1 2 3 4 -basic addTail insertAfter 0 1 2 3 4 -basic addTail insertBefore 0 1 2 3 4 - -Queue test -queue 0 1 2 3 4 - -Stack test -stack 4 3 2 1 0 - -testList -list 0 1 2 3 4 - -Random insert/remove test -stack 4 3 2 1 0 - -Ordered Queue test -list 0 1 2 3 4 -LinkedList: totalConstruct 8 totalDestruct 8 -LinkedListNode: totalConstruct 4038 totalDestruct 4038 diff --git a/test/testMessageQueueDiff b/test/testMessageQueueDiff index 50f83d9..53e7159 100644 --- a/test/testMessageQueueDiff +++ b/test/testMessageQueueDiff @@ -1,5 +1,5 @@ --- testMessageQueueGold 2012-01-21 13:09:45.486004216 -0500 -+++ testMessageQueue 2012-05-17 09:13:22.389315038 -0400 ++++ testMessageQueue 2012-07-19 16:06:21.688082743 -0400 @@ -1,5 +1,2 @@ message 1 messageType info message 4 messageType info diff --git a/test/testPVAppend b/test/testPVAppend index e53cd78..1432a78 100644 --- a/test/testPVAppend +++ b/test/testPVAppend @@ -1,11 +1,17 @@ + +testAppendSimple structure string fieldlist value,timeStamp string extra junk + +testAppendMore structure structure child1 string value bla structure child2 string value blabla + +testAppends structure structure child1 string Joe Good Guy diff --git a/test/testPVAppendDiff b/test/testPVAppendDiff index b821501..5a171dc 100644 --- a/test/testPVAppendDiff +++ b/test/testPVAppendDiff @@ -1,14 +1,18 @@ --- testPVAppendGold 2012-01-21 13:09:44.859000430 -0500 -+++ testPVAppend 2012-05-17 09:13:21.533308559 -0400 -@@ -1,32 +1,28 @@ ++++ testPVAppend 2012-07-19 16:06:14.969023006 -0400 +@@ -1,32 +1,34 @@ -structure request - string fieldList value,timeStamp -structure request - string fieldList value,timeStamp ++ ++testAppendSimple +structure + string fieldlist value,timeStamp string extra junk -structure parent ++ ++testAppendMore +structure structure child1 string value bla @@ -16,6 +20,8 @@ - string value bla -structure parent + string value blabla ++ ++testAppends +structure structure child1 string Joe Good Guy diff --git a/test/testPVAuxInfoDiff b/test/testPVAuxInfoDiff index 9b0a12d..da0704f 100644 --- a/test/testPVAuxInfoDiff +++ b/test/testPVAuxInfoDiff @@ -1,5 +1,5 @@ --- testPVAuxInfoGold 2012-01-21 13:09:44.897000654 -0500 -+++ testPVAuxInfo 2012-05-17 09:13:21.545308649 -0400 ++++ testPVAuxInfo 2012-07-19 16:06:14.993023219 -0400 @@ -1,31 +1,29 @@ testPVAuxInfo diff --git a/test/testPVData b/test/testPVData index 8067e7b..9848d53 100644 --- a/test/testPVData +++ b/test/testPVData @@ -48,10 +48,10 @@ structure int nanoSeconds 1000000 int userTag 0 structure valueAlarm - boolean active false + boolean active true int falseSeverity 0 - int trueSeverity 0 - int changeStateSeverity 0 + int trueSeverity 2 + int changeStateSeverity 1 structure byte value 127 structure alarm diff --git a/test/testPVDataDiff b/test/testPVDataDiff index 3fdefc4..6590fdb 100644 --- a/test/testPVDataDiff +++ b/test/testPVDataDiff @@ -1,5 +1,5 @@ --- testPVDataGold 2012-01-21 13:09:44.840000316 -0500 -+++ testPVData 2012-05-17 09:13:21.497308287 -0400 ++++ testPVData 2012-07-19 16:06:14.905022437 -0400 @@ -1,13 +1,13 @@ -structure request - string fieldList value,timeStamp @@ -19,7 +19,7 @@ long secondsPastEpoch 0 int nanoSeconds 0 int userTag 0 -@@ -25,21 +25,25 @@ +@@ -25,50 +25,52 @@ string extra testScalar @@ -56,11 +56,15 @@ long secondsPastEpoch 123456789 int nanoSeconds 1000000 int userTag 0 -@@ -48,27 +52,25 @@ + structure valueAlarm +- boolean active false ++ boolean active true int falseSeverity 0 - int trueSeverity 0 - int changeStateSeverity 0 +- int trueSeverity 0 +- int changeStateSeverity 0 -structure byte ++ int trueSeverity 2 ++ int changeStateSeverity 1 +structure byte value 127 - alarm alarm diff --git a/test/testPVStructureArray b/test/testPVStructureArray index 5d533c5..4d0d54a 100644 --- a/test/testPVStructureArray +++ b/test/testPVStructureArray @@ -1,11 +1,121 @@ +pvAlarmStructure +structure[] + structure + int severity 0 + int status 0 + string message + structure + int severity 0 + int status 0 + string message +copy +structure[] + structure + int severity 0 + int status 0 + string message + structure + int severity 0 + int status 0 + string message after append 5 structure structure[] value - null - null - null - null - null + structure + structure voltage + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure power + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure current + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure + structure voltage + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure power + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure current + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure + structure voltage + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure power + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure current + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure + structure voltage + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure power + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure current + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure + structure voltage + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure power + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure current + double value 0 + structure alarm + int severity 0 + int status 0 + string message structure alarm int severity 0 int status 0 @@ -17,9 +127,63 @@ structure after remove(0,2) structure structure[] value - null - null - null + structure + structure voltage + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure power + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure current + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure + structure voltage + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure power + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure current + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure + structure voltage + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure power + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure current + double value 0 + structure alarm + int severity 0 + int status 0 + string message structure alarm int severity 0 int status 0 @@ -28,10 +192,46 @@ structure long secondsPastEpoch 0 int nanoSeconds 0 int userTag 0 -after remove 0,1,3structure +after remove 2,1structure structure[] value - null - null + structure + structure voltage + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure power + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure current + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure + structure voltage + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure power + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure current + double value 0 + structure alarm + int severity 0 + int status 0 + string message structure alarm int severity 0 int status 0 @@ -42,6 +242,44 @@ after remove 0,1,3structure int userTag 0 after compressstructure structure[] value + structure + structure voltage + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure power + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure current + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure + structure voltage + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure power + double value 0 + structure alarm + int severity 0 + int status 0 + string message + structure current + double value 0 + structure alarm + int severity 0 + int status 0 + string message structure alarm int severity 0 int status 0 diff --git a/test/testPVStructureArrayDiff b/test/testPVStructureArrayDiff index 4742014..0d741ba 100644 --- a/test/testPVStructureArrayDiff +++ b/test/testPVStructureArrayDiff @@ -1,111 +1,106 @@ --- testPVStructureArrayGold 2012-01-21 13:09:45.250002792 -0500 -+++ testPVStructureArray 2012-05-17 09:13:21.512308401 -0400 -@@ -1,207 +1,52 @@ ++++ testPVStructureArray 2012-07-19 16:06:14.944022783 -0400 +@@ -1,7 +1,27 @@ ++pvAlarmStructure ++structure[] ++ structure ++ int severity 0 ++ int status 0 ++ string message ++ structure ++ int severity 0 ++ int status 0 ++ string message ++copy ++structure[] ++ structure ++ int severity 0 ++ int status 0 ++ string message ++ structure ++ int severity 0 ++ int status 0 ++ string message after append 5 -structure powerSupply +structure structure[] value - structure powerSupply -- structure voltage -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure power -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure current -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message ++ structure + structure voltage + double value 0 + structure alarm +@@ -20,7 +40,7 @@ + int severity 0 + int status 0 + string message - structure powerSupply -- structure voltage -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure power -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure current -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message ++ structure + structure voltage + double value 0 + structure alarm +@@ -39,7 +59,75 @@ + int severity 0 + int status 0 + string message - structure powerSupply -- structure voltage -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure power -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure current -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure powerSupply -- structure voltage -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure power -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure current -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure powerSupply -- structure voltage -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure power -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure current -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- alarm alarm -+ null -+ null -+ null -+ null -+ null ++ structure ++ structure voltage ++ double value 0 ++ structure alarm ++ int severity 0 ++ int status 0 ++ string message ++ structure power ++ double value 0 ++ structure alarm ++ int severity 0 ++ int status 0 ++ string message ++ structure current ++ double value 0 ++ structure alarm ++ int severity 0 ++ int status 0 ++ string message ++ structure ++ structure voltage ++ double value 0 ++ structure alarm ++ int severity 0 ++ int status 0 ++ string message ++ structure power ++ double value 0 ++ structure alarm ++ int severity 0 ++ int status 0 ++ string message ++ structure current ++ double value 0 ++ structure alarm ++ int severity 0 ++ int status 0 ++ string message ++ structure ++ structure voltage ++ double value 0 ++ structure alarm ++ int severity 0 ++ int status 0 ++ string message ++ structure power ++ double value 0 ++ structure alarm ++ int severity 0 ++ int status 0 ++ string message ++ structure current ++ double value 0 ++ structure alarm ++ int severity 0 ++ int status 0 ++ string message + structure alarm + int severity 0 + int status 0 @@ -117,9 +112,33 @@ +after remove(0,2) +structure + structure[] value -+ null -+ null -+ null ++ structure + structure voltage + double value 0 + structure alarm +@@ -58,7 +146,7 @@ + int severity 0 + int status 0 + string message +- structure powerSupply ++ structure + structure voltage + double value 0 + structure alarm +@@ -77,7 +165,7 @@ + int severity 0 + int status 0 + string message +- structure powerSupply ++ structure + structure voltage + double value 0 + structure alarm +@@ -96,19 +184,17 @@ + int severity 0 + int status 0 + string message +- alarm alarm + structure alarm int severity 0 int status 0 @@ -130,49 +149,29 @@ int nanoSeconds 0 int userTag 0 -after remove 0,1,3structure powerSupply -+after remove 0,1,3structure ++after remove 2,1structure structure[] value - null - null -- structure powerSupply -- structure voltage -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure power -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure current -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message +- null - null - structure powerSupply -- structure voltage -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure power -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure current -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message ++ structure + structure voltage + double value 0 + structure alarm +@@ -127,8 +213,7 @@ + int severity 0 + int status 0 + string message +- null +- structure powerSupply ++ structure + structure voltage + double value 0 + structure alarm +@@ -147,17 +232,17 @@ + int severity 0 + int status 0 + string message - alarm alarm + structure alarm int severity 0 @@ -187,43 +186,23 @@ +after compressstructure structure[] value - structure powerSupply -- structure voltage -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure power -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure current -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message ++ structure + structure voltage + double value 0 + structure alarm +@@ -176,7 +261,7 @@ + int severity 0 + int status 0 + string message - structure powerSupply -- structure voltage -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure power -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message -- structure current -- double value 0 -- structure alarm -- int severity 0 -- int status 0 -- string message ++ structure + structure voltage + double value 0 + structure alarm +@@ -195,13 +280,11 @@ + int severity 0 + int status 0 + string message - alarm alarm + structure alarm int severity 0 diff --git a/test/testPropertyAux b/test/testPropertyAux index 7301906..6e30b31 100644 --- a/test/testPropertyAux +++ b/test/testPropertyAux @@ -1 +1 @@ -2012.05.17 09:13:22 407248552 nanoSeconds isDst true userTag 32 +2012.07.19 16:06:21 736405214 nanoSeconds isDst true userTag 32 diff --git a/test/testPropertyDiff b/test/testPropertyDiff index 8b1232e..684e5a5 100644 --- a/test/testPropertyDiff +++ b/test/testPropertyDiff @@ -1,5 +1,5 @@ --- testPropertyGold 2012-01-21 13:09:45.080001766 -0500 -+++ testProperty 2012-05-17 09:13:22.406315168 -0400 ++++ testProperty 2012-07-19 16:06:21.736083171 -0400 @@ -1,34 +1,32 @@ -structure value +structure diff --git a/test/testQueueDiff b/test/testQueueDiff index 310e70f..079950c 100644 --- a/test/testQueueDiff +++ b/test/testQueueDiff @@ -1,5 +1,5 @@ --- testQueueGold 2012-01-21 13:09:45.310003152 -0500 -+++ testQueue 2012-05-17 09:13:22.377314948 -0400 ++++ testQueue 2012-07-19 16:06:21.666082550 -0400 @@ -1,3 +0,0 @@ -event: totalConstruct 4 totalDestruct 4 -queue: totalConstruct 1 totalDestruct 1 diff --git a/test/testThread b/test/testThread index 19de205..6afd85e 100644 --- a/test/testThread +++ b/test/testThread @@ -1,9 +1,5 @@ Action waiting -main1 true +main true Action is false -Action1 true +Action true Action is true -executor: totalConstruct 2 totalDestruct 2 -LinkedList: totalConstruct 4 totalDestruct 4 -LinkedListNode: totalConstruct 12 totalDestruct 12 -event: totalConstruct 8 totalDestruct 8 diff --git a/test/testThreadAux b/test/testThreadAux index ca6d3af..4723f15 100644 --- a/test/testThreadAux +++ b/test/testThreadAux @@ -1 +1 @@ -time per call 8.704012 microseconds +time per call 0.782178 microseconds diff --git a/test/testThreadDiff b/test/testThreadDiff index e69de29..b9196e6 100644 --- a/test/testThreadDiff +++ b/test/testThreadDiff @@ -0,0 +1,14 @@ +--- testThreadGold 2012-01-21 13:09:45.300003093 -0500 ++++ testThread 2012-07-19 16:06:14.786021379 -0400 +@@ -1,9 +1,5 @@ + Action waiting +-main1 true ++main true + Action is false +-Action1 true ++Action true + Action is true +-executor: totalConstruct 2 totalDestruct 2 +-LinkedList: totalConstruct 4 totalDestruct 4 +-LinkedListNode: totalConstruct 12 totalDestruct 12 +-event: totalConstruct 8 totalDestruct 8 diff --git a/test/testTimeStampAux b/test/testTimeStampAux index d8ad94c..af1506b 100644 --- a/test/testTimeStampAux +++ b/test/testTimeStampAux @@ -1,5 +1,5 @@ -current 1337260401 557245202 milliSec 1337260401557 -2012.05.17 09:13:21 557245202 nanoSeconds isDst true +current 1342728375 15960253 milliSec 1342728375015 +2012.07.19 16:06:15 15960253 nanoSeconds isDst true fromTime_t -current 1337260401 0 milliSec 1337260401000 -2012.05.17 09:13:21 0 nanoSeconds isDst true +current 1342728375 0 milliSec 1342728375000 +2012.07.19 16:06:15 0 nanoSeconds isDst true diff --git a/test/testTimer b/test/testTimer index 27df488..e69de29 100644 --- a/test/testTimer +++ b/test/testTimer @@ -1,5 +0,0 @@ -timerNode: totalConstruct 6 totalDestruct 6 -timer: totalConstruct 3 totalDestruct 3 -LinkedList: totalConstruct 3 totalDestruct 3 -LinkedListNode: totalConstruct 9 totalDestruct 9 -event: totalConstruct 12 totalDestruct 12 diff --git a/test/testTimerAux b/test/testTimerAux index 9c03135..921aa2f 100644 --- a/test/testTimerAux +++ b/test/testTimerAux @@ -1,6 +1,60 @@ -one requested 0.400000 diff 0.400134 seconds -two requested 0.200000 diff 0.200133 seconds -one requested 0.200000 diff 0.200128 seconds -two requested 0.400000 diff 0.400131 seconds -one requested 0.000000 diff 0.000036 seconds -two requested 0.000000 diff 0.000043 seconds +one requested 0.400000 actual 0.400149 delta 0.000149 +two requested 0.200000 actual 0.200165 delta 0.000165 +three requested 0.100000 actual 0.100116 delta 0.000116 +one requested 0.400000 actual 0.400270 delta 0.000270 +two requested 0.200000 actual 0.200209 delta 0.000209 +three requested 0.100000 actual 0.100178 delta 0.000178 +one requested 0.400000 actual 0.400172 delta 0.000172 +two requested 0.200000 actual 0.200164 delta 0.000164 +three requested 0.100000 actual 0.100166 delta 0.000166 +one requested 0.400000 actual 0.400177 delta 0.000177 +three requested 0.100000 actual 0.100253 delta 0.000253 +one requested 0.400000 actual 0.400172 delta 0.000172 +three requested 0.100000 actual 0.100201 delta 0.000201 +one requested 0.400000 actual 0.400179 delta 0.000179 +three requested 0.100000 actual 0.100178 delta 0.000178 +one requested 0.100000 actual 0.100165 delta 0.000165 +two requested 0.200000 actual 0.200220 delta 0.000220 +three requested 0.400000 actual 0.400203 delta 0.000203 +one requested 0.100000 actual 0.100206 delta 0.000206 +two requested 0.200000 actual 0.200234 delta 0.000234 +three requested 0.400000 actual 0.400251 delta 0.000251 +one requested 0.100000 actual 0.100189 delta 0.000189 +two requested 0.200000 actual 0.200400 delta 0.000400 +three requested 0.400000 actual 0.400426 delta 0.000426 +one requested 0.100000 actual 0.100227 delta 0.000227 +three requested 0.400000 actual 0.400281 delta 0.000281 +one requested 0.100000 actual 0.100177 delta 0.000177 +three requested 0.400000 actual 0.400293 delta 0.000293 +one requested 0.100000 actual 0.100196 delta 0.000196 +three requested 0.400000 actual 0.400236 delta 0.000236 +one requested 0.100000 actual 0.100193 delta 0.000193 +two requested 0.400000 actual 0.400186 delta 0.000186 +three requested 0.200000 actual 0.200206 delta 0.000206 +one requested 0.100000 actual 0.100202 delta 0.000202 +two requested 0.400000 actual 0.400232 delta 0.000232 +three requested 0.200000 actual 0.200198 delta 0.000198 +one requested 0.100000 actual 0.100199 delta 0.000199 +two requested 0.400000 actual 0.400216 delta 0.000216 +three requested 0.200000 actual 0.200235 delta 0.000235 +one requested 0.100000 actual 0.100231 delta 0.000231 +three requested 0.200000 actual 0.200250 delta 0.000250 +one requested 0.100000 actual 0.100201 delta 0.000201 +three requested 0.200000 actual 0.200195 delta 0.000195 +one requested 0.100000 actual 0.100198 delta 0.000198 +three requested 0.200000 actual 0.200232 delta 0.000232 +one requested 0.000000 actual 0.000059 delta 0.000059 +two requested 0.000000 actual 0.000127 delta 0.000127 +three requested 0.000000 actual 0.000194 delta 0.000194 +one requested 0.000000 actual 0.000043 delta 0.000043 +two requested 0.000000 actual 0.000106 delta 0.000106 +three requested 0.000000 actual 0.000171 delta 0.000171 +one requested 0.000000 actual 0.000036 delta 0.000036 +two requested 0.000000 actual 0.000098 delta 0.000098 +three requested 0.000000 actual 0.000161 delta 0.000161 +one requested 0.000000 actual 0.000056 delta 0.000056 +three requested 0.000000 actual 0.000120 delta 0.000120 +one requested 0.000000 actual 0.000037 delta 0.000037 +three requested 0.000000 actual 0.000099 delta 0.000099 +one requested 0.000000 actual 0.000038 delta 0.000038 +three requested 0.000000 actual 0.000099 delta 0.000099 diff --git a/test/testTimerDiff b/test/testTimerDiff index e69de29..d68067e 100644 --- a/test/testTimerDiff +++ b/test/testTimerDiff @@ -0,0 +1,8 @@ +--- testTimerGold 2012-01-21 13:09:44.818000181 -0500 ++++ testTimer 2012-07-19 16:06:15.023023486 -0400 +@@ -1,5 +0,0 @@ +-timerNode: totalConstruct 6 totalDestruct 6 +-timer: totalConstruct 3 totalDestruct 3 +-LinkedList: totalConstruct 3 totalDestruct 3 +-LinkedListNode: totalConstruct 9 totalDestruct 9 +-event: totalConstruct 12 totalDestruct 12