Improvements to the output of the speed tests. (CVS 3785)

FossilOrigin-Name: 1a4d8024b06488f17831b5d3d47e41c5f1134800

diff --git a/manifest b/manifest
index 808c985026d1dc19a76fdb5757aaf2beb3f041e5..359058cf5e109e2de16ec079c28e266ae351914a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sunreachable\scode\sfrom\sutil.c.\s(CVS\s3784)
-D 2007-03-31T22:33:48
+C Improvements\sto\sthe\soutput\sof\sthe\sspeed\stests.\s(CVS\s3785)
+D 2007-03-31T22:34:16
 F Makefile.in 2f2c3bf69faf0ae7b8e8af4f94f1986849034530
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -306,8 +306,8 @@ F test/shared2.test 8b48f8d33494413ef4cf250110d89403e2bf6b23
 F test/shared3.test 01e3e124dbb3859788aabc7cfb82f7ea04421749
 F test/shared_err.test 841f7341eb07ed97c713bf89960a4e9199717193
 F test/sort.test 0e4456e729e5a92a625907c63dcdedfbe72c5dc5
-F test/speed1.test 0ab227eae013d064f2205adcb9ee6f3c325b5bf4
-F test/speed2.test f954e0aa83431a9631991192230db88fa1811f2c
+F test/speed1.test 22e1b27af0683ed44dcd2f93ed817a9c3e65084a
+F test/speed2.test 9b93b93681f82f320caa4b2c9f15c0de4f3a3d33
 F test/subquery.test ae324ee928c5fb463a3ce08a8860d6e7f1ca5797
 F test/subselect.test 2d13fb7f450db3595adcdd24079a0dd1d2d6abc2
 F test/sync.test d05397b8f89f423dd6dba528692019ab036bc1c3
@@ -315,7 +315,7 @@ F test/table.test feea6a3eb08cf166f570255eea5447e42ef82498
 F test/tableapi.test 036575a98dcce7c92e9f39056839bbad8a715412
 F test/tclsqlite.test 51334389283c74bcbe28645a73159b17e239e9f3
 F test/temptable.test c36f3e5a94507abb64f7ba23deeb4e1a8a8c3821
-F test/tester.tcl efa900507eabc20de8138d9233b6b0502e4f229a
+F test/tester.tcl dda002daff1618f2ef0b451eff221581ca54afde
 F test/thread1.test 776c9e459b75ba905193b351926ac4019b049f35
 F test/thread2.test 6d7b30102d600f51b4055ee3a5a19228799049fb
 F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
@@ -447,7 +447,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P a0f3c960fa3e958e12bc488451ee2d637562909b
-R 2baee240a9b5b31699a0341f39d57beb
+P 82b7a6f05c737f6ad4a21f354e55ec268fa1b032
+R badcf1e5ee65ad276d676073effd0995
 U drh
-Z da59ec94aad32c9572e6cb7f5170d256
+Z c3b0df404bc6aeead004fa0f8974a7b5

diff --git a/manifest.uuid b/manifest.uuid
index b8c85158f8a1b745aa1b0cdf78f5ccd7f8681d06..ffdce4d9e4d8bdd4f7b09138a7bf7286564e6759 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-82b7a6f05c737f6ad4a21f354e55ec268fa1b032
\ No newline at end of file
+1a4d8024b06488f17831b5d3d47e41c5f1134800
\ No newline at end of file

diff --git a/test/speed1.test b/test/speed1.test
index dfaf84a15cf060de843d602643ea8a1625ff0da3..8b6ab9d4c620f9f9d3846b27dc92c85581f04589 100644 (file)
--- a/test/speed1.test
+++ b/test/speed1.test
@@ -11,11 +11,12 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is measuring executing speed.
 #
-# $Id: speed1.test,v 1.4 2007/03/26 16:30:16 drh Exp $
+# $Id: speed1.test,v 1.5 2007/03/31 22:34:16 drh Exp $
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+speed_trial_init speed1
 
 # Set a uniform random seed
 expr srand(0)
@@ -283,5 +284,6 @@ speed_trial speed1-random-del2 20000 row {
 do_test speed1-1.2 {
   db one {SELECT count(*) FROM t1}
 } 10000
+speed_trial_summary speed1
 
 finish_test

diff --git a/test/speed2.test b/test/speed2.test
index f385232ed2ce7b2c03945a7fe2cb9d74b06e72c9..08ddb15f462487fb1fd2f1cc9af7fdffb299381a 100644 (file)
--- a/test/speed2.test
+++ b/test/speed2.test
@@ -11,11 +11,12 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is measuring executing speed.
 #
-# $Id: speed2.test,v 1.5 2007/03/31 15:02:50 drh Exp $
+# $Id: speed2.test,v 1.6 2007/03/31 22:34:16 drh Exp $
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+speed_trial_init speed2
 
 # Set a uniform random seed
 expr srand(0)
@@ -332,5 +333,7 @@ speed_trial speed2-random-del2 20000 row {
 do_test speed2-1.2 {
   db one {SELECT count(*) FROM t1}
 } 10000
+speed_trial_summary speed2
+
 
 finish_test

diff --git a/test/tester.tcl b/test/tester.tcl
index d65e8c304fef270f2d4f56dcc6badc8860d72052..2e9e12bff0d2e1ff4c6598b3741d60733e1b736a 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -11,7 +11,7 @@
 # This file implements some common TCL routines used for regression
 # testing the SQLite library
 #
-# $Id: tester.tcl,v 1.76 2007/03/25 19:08:47 drh Exp $
+# $Id: tester.tcl,v 1.77 2007/03/31 22:34:16 drh Exp $
 
 # Make sure tclsqlite3 was compiled correctly.  Abort now with an
 # error message if not.
@@ -125,15 +125,23 @@ proc do_test {name cmd expected} {
 # Return the number of microseconds per statement.
 #
 proc speed_trial {name numstmt units sql} {
-  puts -nonewline [format {%-20.20s } $name...]
+  puts -nonewline [format {%-21.21s } $name...]
   flush stdout
   set speed [time {sqlite3_exec_nr db $sql}]
   set tm [lindex $speed 0]
-  set per [expr {$tm/(1.0*$numstmt)}]
   set rate [expr {1000000.0*$numstmt/$tm}]
-  set u1 us/$units
   set u2 $units/s
-  puts [format {%20.3f %-7s %20.5f %s} $per $u1 $rate $u2]
+  puts [format {%12d uS %20.5f %s} $tm $rate $u2]
+  global total_time
+  set total_time [expr {$total_time+$tm}]
+}
+proc speed_trial_init {name} {
+  global total_time
+  set total_time 0
+}
+proc speed_trial_summary {name} {
+  global total_time
+  puts [format {%-21.21s %12d uS TOTAL} $name $total_time]
 }
 
 # The procedure uses the special "sqlite_malloc_stat" command