Index: test/wordcount.c
==================================================================
--- test/wordcount.c
+++ test/wordcount.c
@@ -27,10 +27,11 @@
 **     --pagesize NNN       Use a page size of NNN
 **     --cachesize NNN      Use a cache size of NNN
 **     --commit NNN         Commit after every NNN operations
 **     --nosync             Use PRAGMA synchronous=OFF
 **     --journal MMMM       Use PRAGMA journal_mode=MMMM
+**     --timer              Time the operation of this program
 **
 ** Modes:
 **
 ** Insert mode means:
 **    (1) INSERT OR IGNORE INTO wordcount VALUES($new,1)
@@ -77,10 +78,25 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include "sqlite3.h"
+
+/* Return the current wall-clock time */
+static sqlite3_int64 realTime(void){
+  static sqlite3_vfs *clockVfs = 0;
+  sqlite3_int64 t;
+  if( clockVfs==0 ) clockVfs = sqlite3_vfs_find(0);
+  if( clockVfs->iVersion>=1 && clockVfs->xCurrentTimeInt64!=0 ){
+    clockVfs->xCurrentTimeInt64(clockVfs, &t);
+  }else{
+    double r;
+    clockVfs->xCurrentTime(clockVfs, &r);
+    t = (sqlite3_int64)(r*86400000.0);
+  }
+  return t;
+}
 
 /* Print an error message and exit */
 static void fatal_error(const char *zMsg, ...){
   va_list ap;
   va_start(ap, zMsg);
@@ -184,10 +200,11 @@
   int iMode = MODE_INSERT;      /* One of MODE_xxxxx */
   int useNocase = 0;            /* True for --nocase */
   int doTrace = 0;              /* True for --trace */
   int showStats = 0;            /* True for --stats */
   int showSummary = 0;          /* True for --summary */
+  int showTimer = 0;            /* True for --timer */
   int cacheSize = 0;            /* Desired cache size.  0 means default */
   int pageSize = 0;             /* Desired page size.  0 means default */
   int commitInterval = 0;       /* How often to commit.  0 means never */
   int noSync = 0;               /* True for --nosync */
   const char *zJMode = 0;       /* Journal mode */
@@ -201,10 +218,11 @@
   sqlite3_stmt *pDelete = 0;    /* The DELETE statement */
   FILE *in;                     /* The open input file */
   int rc;                       /* Return code from an SQLite interface */
   int iCur, iHiwtr;             /* Statistics values, current and "highwater" */
   sqlite3_int64 sumCnt = 0;     /* Sum in QUERY mode */
+  sqlite3_int64 startTime;
   char zInput[2000];            /* A single line of input */
 
   /* Process command-line arguments */
   for(i=1; i<argc; i++){
     const char *z = argv[i];
@@ -232,10 +250,12 @@
         noSync = 1;
       }else if( strcmp(z,"stats")==0 ){
         showStats = 1;
       }else if( strcmp(z,"summary")==0 ){
         showSummary = 1;
+      }else if( strcmp(z,"timer")==0 ){
+        showTimer = i;
       }else if( strcmp(z,"cachesize")==0 && i<argc-1 ){
         i++;
         cacheSize = atoi(argv[i]);
       }else if( strcmp(z,"pagesize")==0 && i<argc-1 ){
         i++;
@@ -257,10 +277,11 @@
     }
   }
   if( zDbName==0 ){
     fatal_error("Usage: %s [--options] DATABASE [INPUTFILE]\n", argv[0]);
   }
+  startTime = realTime();
 
   /* Open the database and the input file */
   if( sqlite3_open(zDbName, &db) ){
     fatal_error("Cannot open database file: %s\n", zDbName);
   }
@@ -447,10 +468,18 @@
       printf("double-check: %lld\n", sqlite3_column_int64(pSelect, 0));
     }
     sqlite3_finalize(pSelect);
   }
 
+
+  if( showTimer ){
+    sqlite3_int64 elapseTime = realTime() - startTime;
+    printf("/* %3d.%03d", (int)(elapseTime/1000), (int)(elapseTime%1000));
+    for(i=0; i<argc; i++) if( i!=showTimer ) printf(" %s", argv[i]);
+    printf(" */\n");
+  }
+
   if( showSummary ){
     sqlite3_create_function(db, "checksum", -1, SQLITE_UTF8, 0,
                             0, checksumStep, checksumFinalize);
     sqlite3_exec(db, 
       "SELECT 'count(*):  ', count(*) FROM wordcount;\n"