Manual merge from 0.4.

This commit is contained in:
Alexey Kopytov
2011-01-12 13:48:20 +03:00

View File

@ -54,6 +54,8 @@ db_globals_t db_globals;
/* Used in intermediate reports */
unsigned long last_transactions;
unsigned long last_read_ops;
unsigned long last_write_ops;
/* Static variables */
static sb_list_t drivers; /* list of available DB drivers */
@ -812,10 +814,14 @@ void db_print_stats(sb_stat_t type)
seconds = NS2SEC(sb_timer_split(&sb_globals.exec_timer));
log_timestamp(LOG_NOTICE, &sb_globals.exec_timer,
"threads: %d, tps: %4.2f",
"threads: %d, tps: %4.2f, reads/s: %4.2f, writes/s: %4.2f",
sb_globals.num_threads,
(transactions - last_transactions) / seconds);
(transactions - last_transactions) / seconds,
(read_ops - last_read_ops) / seconds,
(write_ops - last_write_ops) / seconds);
last_transactions = transactions;
last_read_ops = read_ops;
last_write_ops = write_ops;
return;
}