From fdfd11c755a877e0fc519ea294888ca5c5e62775 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Tue, 23 Nov 2010 07:58:54 -0500 Subject: [PATCH] bug in testLinkedList.cpp linkedList.h better than std::list but NOT that much better. Look at diffs for test/testLinkedListAux for bug: --- pvDataApp/miscTest/testLinkedList.cpp | 2 +- test/testLinkedListAux | 24 ++++++++++++------------ test/testThreadAux | 2 +- test/testTimeStampAux | 2 +- test/testTimerAux | 12 ++++++------ 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pvDataApp/miscTest/testLinkedList.cpp b/pvDataApp/miscTest/testLinkedList.cpp index 8b668d0..f05cb0f 100644 --- a/pvDataApp/miscTest/testLinkedList.cpp +++ b/pvDataApp/miscTest/testLinkedList.cpp @@ -294,7 +294,7 @@ static void testTime(FILE *auxFd) { } endTime.getCurrent(); double diff = TimeStamp::diff(endTime,startTime); - diff /= 1000.0; + diff *= 1000.0; fprintf(auxFd,"diff %f milliSeconds\n",diff); diff = diff/1000.0; // convert from milliseconds to seconds diff = diff/ntimes; // seconds per outer loop diff --git a/test/testLinkedListAux b/test/testLinkedListAux index 92b2aeb..0dbfb83 100644 --- a/test/testLinkedListAux +++ b/test/testLinkedListAux @@ -1,20 +1,20 @@ Time test -diff 0.000025 milliSeconds -time per iteration 0.000025 microseconds -time per addTail/removeHead 0.000000 microseconds +diff 25.093909 milliSeconds +time per iteration 25.093909 microseconds +time per addTail/removeHead 0.012547 microseconds Time test locked -diff 186.459567 milliSeconds -time per iteration 186.459567 microseconds -time per addTail/removeHead 0.093230 microseconds +diff 176.854724 milliSeconds +time per iteration 176.854724 microseconds +time per addTail/removeHead 0.088427 microseconds Time ArrayList test -diff 652.028489 milliSeconds -time per iteration 652.028489 microseconds -time per addTail/removeHead 0.326014 microseconds +diff 651.776054 milliSeconds +time per iteration 651.776054 microseconds +time per addTail/removeHead 0.325888 microseconds Time ArrayList test locked -diff 799.889631 milliSeconds -time per iteration 799.889631 microseconds -time per addTail/removeHead 0.399945 microseconds +diff 808.411295 milliSeconds +time per iteration 808.411295 microseconds +time per addTail/removeHead 0.404206 microseconds diff --git a/test/testThreadAux b/test/testThreadAux index cdcf511..cc072cb 100644 --- a/test/testThreadAux +++ b/test/testThreadAux @@ -1 +1 @@ -time per call 36.953844 microseconds +time per call 23.580658 microseconds diff --git a/test/testTimeStampAux b/test/testTimeStampAux index 2df1bed..1204fc9 100644 --- a/test/testTimeStampAux +++ b/test/testTimeStampAux @@ -1 +1 @@ -current 1290514910 631889964 milliSec 1290514910631 +current 1290516873 809711508 milliSec 1290516873809 diff --git a/test/testTimerAux b/test/testTimerAux index 8da2b31..25b8865 100644 --- a/test/testTimerAux +++ b/test/testTimerAux @@ -1,6 +1,6 @@ -one requested 0.400000 diff 0.400227 seconds -two requested 0.200000 diff 0.200181 seconds -one requested 0.200000 diff 0.200259 seconds -two requested 0.400000 diff 0.400413 seconds -one requested 0.000000 diff 0.000058 seconds -two requested 0.000000 diff 0.000082 seconds +one requested 0.400000 diff 0.400214 seconds +two requested 0.200000 diff 0.200183 seconds +one requested 0.200000 diff 0.200328 seconds +two requested 0.400000 diff 0.400277 seconds +one requested 0.000000 diff 0.000038 seconds +two requested 0.000000 diff 0.000060 seconds