Fix timestamps in interval reports.

sysbench/db_driver.c

@@ -842,7 +842,7 @@ void db_print_stats(sb_stat_t type)
       sb_histogram_get_pct_intermediate(&global_histogram,
                                              sb_globals.percentile);
 
-    log_timestamp(LOG_NOTICE, seconds,
+    log_timestamp(LOG_NOTICE, NS2SEC(sb_timer_value(&sb_exec_timer)),
                   "threads: %d, tps: %4.2f, reads: %4.2f, writes: %4.2f, "
                   "response time: %4.2fms (%u%%), errors: %4.2f, "
                   "reconnects: %5.2f",

sysbench/sysbench.h

@@ -210,6 +210,9 @@ typedef struct
 extern sb_globals_t sb_globals;
 extern pthread_mutex_t event_queue_mutex;
 
+/* Global execution timer */
+extern sb_timer_t      sb_exec_timer CK_CC_CACHELINE;
+
 /* timers for checkpoint reports */
 extern sb_timer_t      sb_intermediate_timer;
 extern sb_timer_t      sb_checkpoint_timer1;

tests/t/opt_report_interval.t

@@ -7,7 +7,7 @@
   >   exit 80
   > fi
 
-  $ sysbench --test=${SBTEST_SCRIPTDIR}/oltp.lua --db-driver=mysql --mysql-dry-run --max-time=3 --max-requests=0 --report-interval=2 run | grep '\[   2s\]'
+  $ sysbench --test=${SBTEST_SCRIPTDIR}/oltp.lua --db-driver=mysql --mysql-dry-run --max-time=3 --max-requests=0 --report-interval=1 run | grep '\[   2s\]'
   [   2s] threads: 1, tps: *, reads: *, writes: *, response time: *ms (95%), errors: 0.00, reconnects:  0.00 (glob)
 
 # Run a test that does not support intermediate reports