From 99f6fc13dbe8dfb5ef4d7d21b2f513ba9542f1fd Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Thu, 22 Sep 2011 08:16:14 -0400 Subject: [PATCH 1/3] minor changes to tests --- configure/CONFIG_SITE | 1 - test/testBaseExceptionDiff | 2 +- test/testLinkedListAux | 24 ++++++++++++------------ test/testPropertyAux | 2 +- test/testThreadAux | 2 +- test/testTimeStampAux | 8 ++++---- test/testTimerAux | 12 ++++++------ testApp/pv/testIntrospect.cpp | 2 +- testApp/pv/testPVAppend.cpp | 2 +- testApp/pv/testPVAuxInfo.cpp | 2 +- testApp/pv/testPVData.cpp | 2 +- testApp/pv/testPVStructureArray.cpp | 2 +- 12 files changed, 30 insertions(+), 31 deletions(-) diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 674abe7..d669cbb 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -24,7 +24,6 @@ # define INSTALL_LOCATION here #INSTALL_LOCATION= -USR_INCLUDES += -I/usr/include/boost/tr1 INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv USR_INCLUDES += -I $(INSTALL_LOCATION)/include diff --git a/test/testBaseExceptionDiff b/test/testBaseExceptionDiff index 3aecec5..6f2c48d 100644 --- a/test/testBaseExceptionDiff +++ b/test/testBaseExceptionDiff @@ -1,5 +1,5 @@ --- testBaseExceptionGold 2011-04-27 13:11:55.000000000 -0400 -+++ testBaseException 2011-08-30 09:31:21.000000000 -0400 ++++ testBaseException 2011-09-22 08:15:26.000000000 -0400 @@ -1,37 +1,46 @@ + + diff --git a/test/testLinkedListAux b/test/testLinkedListAux index acd2038..ab45d0f 100644 --- a/test/testLinkedListAux +++ b/test/testLinkedListAux @@ -1,20 +1,20 @@ Time test -diff 22.284825 milliSeconds -time per iteration 22.284825 microseconds -time per addTail/removeHead 0.011142 microseconds +diff 25.975918 milliSeconds +time per iteration 25.975918 microseconds +time per addTail/removeHead 0.012988 microseconds Time test locked -diff 204.476572 milliSeconds -time per iteration 204.476572 microseconds -time per addTail/removeHead 0.102238 microseconds +diff 180.990311 milliSeconds +time per iteration 180.990311 microseconds +time per addTail/removeHead 0.090495 microseconds Time std::list test -diff 629.578567 milliSeconds -time per iteration 629.578567 microseconds -time per addTail/removeHead 0.314789 microseconds +diff 634.817044 milliSeconds +time per iteration 634.817044 microseconds +time per addTail/removeHead 0.317409 microseconds Time std::list test locked -diff 784.572710 milliSeconds -time per iteration 784.572710 microseconds -time per addTail/removeHead 0.392286 microseconds +diff 801.805946 milliSeconds +time per iteration 801.805946 microseconds +time per addTail/removeHead 0.400903 microseconds diff --git a/test/testPropertyAux b/test/testPropertyAux index 325873e..fbcfa5b 100644 --- a/test/testPropertyAux +++ b/test/testPropertyAux @@ -1 +1 @@ -2011.06.07 07:20:33 714092060 nanoSeconds isDst true +2011.09.22 08:15:32 297500698 nanoSeconds isDst true diff --git a/test/testThreadAux b/test/testThreadAux index ba16c6e..42043c6 100644 --- a/test/testThreadAux +++ b/test/testThreadAux @@ -1 +1 @@ -time per call 0.007466 microseconds +time per call 35.942059 microseconds diff --git a/test/testTimeStampAux b/test/testTimeStampAux index aee1b02..69c8c3c 100644 --- a/test/testTimeStampAux +++ b/test/testTimeStampAux @@ -1,5 +1,5 @@ -current 1307445632 825675237 milliSec 1307445632825 -2011.06.07 07:20:32 825675237 nanoSeconds isDst true +current 1316693731 343782420 milliSec 1316693731343 +2011.09.22 08:15:31 343782420 nanoSeconds isDst true fromTime_t -current 1307445632 0 milliSec 1307445632000 -2011.06.07 07:20:32 0 nanoSeconds isDst true +current 1316693731 0 milliSec 1316693731000 +2011.09.22 08:15:31 0 nanoSeconds isDst true diff --git a/test/testTimerAux b/test/testTimerAux index 455b33a..2c394cf 100644 --- a/test/testTimerAux +++ b/test/testTimerAux @@ -1,6 +1,6 @@ -one requested 0.400000 diff 0.400240 seconds -two requested 0.200000 diff 0.200201 seconds -one requested 0.200000 diff 0.200203 seconds -two requested 0.400000 diff 0.400185 seconds -one requested 0.000000 diff 0.000028 seconds -two requested 0.000000 diff 0.000075 seconds +one requested 0.400000 diff 0.400292 seconds +two requested 0.200000 diff 0.200304 seconds +one requested 0.200000 diff 0.200222 seconds +two requested 0.400000 diff 0.400264 seconds +one requested 0.000000 diff 0.000075 seconds +two requested 0.000000 diff 0.000100 seconds diff --git a/testApp/pv/testIntrospect.cpp b/testApp/pv/testIntrospect.cpp index a17f48e..6da6d49 100644 --- a/testApp/pv/testIntrospect.cpp +++ b/testApp/pv/testIntrospect.cpp @@ -148,7 +148,7 @@ int main(int argc,char *argv[]) testSimpleStructure(fd); testStructureArray(fd); epicsExitCallAtExits(); - CDRMonitor::get().show(fd); + CDRMonitor::get().show(fd,true); return(0); } diff --git a/testApp/pv/testPVAppend.cpp b/testApp/pv/testPVAppend.cpp index 25e1d2f..33140df 100644 --- a/testApp/pv/testPVAppend.cpp +++ b/testApp/pv/testPVAppend.cpp @@ -145,7 +145,7 @@ int main(int argc,char *argv[]) testAppendMore(fd); testAppends(fd); epicsExitCallAtExits(); - CDRMonitor::get().show(fd); + CDRMonitor::get().show(fd,true); return(0); } diff --git a/testApp/pv/testPVAuxInfo.cpp b/testApp/pv/testPVAuxInfo.cpp index da0b100..750f178 100644 --- a/testApp/pv/testPVAuxInfo.cpp +++ b/testApp/pv/testPVAuxInfo.cpp @@ -94,7 +94,7 @@ int main(int argc,char *argv[]) convert = getConvert(); testPVAuxInfo(fd); epicsExitCallAtExits(); - CDRMonitor::get().show(fd); + CDRMonitor::get().show(fd,true); return(0); } diff --git a/testApp/pv/testPVData.cpp b/testApp/pv/testPVData.cpp index e169602..2fa6102 100644 --- a/testApp/pv/testPVData.cpp +++ b/testApp/pv/testPVData.cpp @@ -301,7 +301,7 @@ int main(int argc,char *argv[]) testPVScalar(fd); testScalarArray(fd); epicsExitCallAtExits(); - CDRMonitor::get().show(fd); + CDRMonitor::get().show(fd,true); return(0); } diff --git a/testApp/pv/testPVStructureArray.cpp b/testApp/pv/testPVStructureArray.cpp index afd211b..af4c042 100644 --- a/testApp/pv/testPVStructureArray.cpp +++ b/testApp/pv/testPVStructureArray.cpp @@ -81,7 +81,7 @@ int main(int argc,char *argv[]) standardPVField = getStandardPVField(); testPowerSupplyArray(fd); epicsExitCallAtExits(); - CDRMonitor::get().show(fd); + CDRMonitor::get().show(fd,true); return(0); } From ced144c4c4ef2f0dabcd893132a85c521a9a823e Mon Sep 17 00:00:00 2001 From: Guobao Shen Date: Mon, 26 Sep 2011 15:08:33 -0400 Subject: [PATCH 2/3] add messageTypeCount (=4 by default) for messageTypeName. --- pvDataApp/misc/requester.cpp | 4 ++-- pvDataApp/misc/requester.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pvDataApp/misc/requester.cpp b/pvDataApp/misc/requester.cpp index d9b826e..0e1bbaa 100644 --- a/pvDataApp/misc/requester.cpp +++ b/pvDataApp/misc/requester.cpp @@ -8,7 +8,8 @@ #include namespace epics { namespace pvData { -static std::string typeName[] = { +const size_t messageTypeCount = 4; +static std::string typeName[messageTypeCount] = { String("info"), String("warning"), String("error"), @@ -16,5 +17,4 @@ static std::string typeName[] = { }; StringArray messageTypeName = typeName; - }} diff --git a/pvDataApp/misc/requester.h b/pvDataApp/misc/requester.h index d36a432..1add4cc 100644 --- a/pvDataApp/misc/requester.h +++ b/pvDataApp/misc/requester.h @@ -19,7 +19,7 @@ enum MessageType { }; extern StringArray messageTypeName; - +extern const size_t messageTypeCount; class Requester { public: POINTER_DEFINITIONS(Requester); From 9d8cbe8ce40bec2ae73222883890931230254420 Mon Sep 17 00:00:00 2001 From: Guobao Shen Date: Mon, 26 Sep 2011 15:26:05 -0400 Subject: [PATCH 3/3] add severityCount for severityNames --- pvDataApp/property/alarm.cpp | 3 ++- pvDataApp/property/alarm.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pvDataApp/property/alarm.cpp b/pvDataApp/property/alarm.cpp index 372a518..e1befb5 100644 --- a/pvDataApp/property/alarm.cpp +++ b/pvDataApp/property/alarm.cpp @@ -12,7 +12,8 @@ #include namespace epics { namespace pvData { -static String severityNames[4] = +const size_t severityCount = 4; +static String severityNames[severityCount] = { String("none"), String("minor"), diff --git a/pvDataApp/property/alarm.h b/pvDataApp/property/alarm.h index cde8c41..686afdf 100644 --- a/pvDataApp/property/alarm.h +++ b/pvDataApp/property/alarm.h @@ -14,6 +14,7 @@ enum AlarmSeverity { noAlarm,minorAlarm,majorAlarm,invalidAlarm }; +extern const size_t severityCount; class AlarmSeverityFunc { public: static AlarmSeverity getSeverity(int value);