diff --git a/src/sysbench.c b/src/sysbench.c index cc296b4..4325f47 100644 --- a/src/sysbench.c +++ b/src/sysbench.c @@ -296,8 +296,10 @@ void sb_report_cumulative(sb_stat_t *stat) } log_text(LOG_NOTICE, ""); - log_text(LOG_NOTICE, "General statistics:"); - log_text(LOG_NOTICE, " total time: %.4fs", + log_text(LOG_NOTICE, "Throughput:"); + log_text(LOG_NOTICE, " events/s (eps): %.4f", + stat->events / stat->time_interval); + log_text(LOG_NOTICE, " time elapsed: %.4fs", stat->time_total); log_text(LOG_NOTICE, " total number of events: %" PRIu64, stat->events); @@ -318,8 +320,6 @@ void sb_report_cumulative(sb_stat_t *stat) else log_text(LOG_NOTICE, " percentile stats: disabled"); - log_text(LOG_NOTICE, " sum: %10.2f", - SEC2MS(stat->latency_sum)); log_text(LOG_NOTICE, ""); /* Aggregate temporary timers copy */ diff --git a/src/tests/fileio/sb_fileio.c b/src/tests/fileio/sb_fileio.c index f21cd88..84e2236 100644 --- a/src/tests/fileio/sb_fileio.c +++ b/src/tests/fileio/sb_fileio.c @@ -179,7 +179,8 @@ static unsigned int fsynced_file2; /* fsyncing in the end */ static int is_dirty; /* any writes after last fsync series ? */ static unsigned int req_performed; /* number of requests done */ -static const double megabyte = 1024.0 * 1024.0; +static const double mebibyte = 1024 * 1024; +static const double megabyte = 1000 * 1000; #ifdef HAVE_MMAP /* Array of file mappings */ @@ -821,8 +822,8 @@ void file_report_intermediate(sb_stat_t *stat) log_timestamp(LOG_NOTICE, stat->time_total, "reads: %4.2f MiB/s writes: %4.2f MiB/s fsyncs: %4.2f/s " "latency (ms,%u%%): %4.3f", - stat->bytes_read / megabyte / seconds, - stat->bytes_written / megabyte / seconds, + stat->bytes_read / mebibyte / seconds, + stat->bytes_written / mebibyte / seconds, stat->other / seconds, sb_globals.percentile, SEC2MS(stat->latency_pct)); @@ -835,21 +836,36 @@ void file_report_cumulative(sb_stat_t *stat) const double seconds = stat->time_interval; log_text(LOG_NOTICE, "\n" - "File operations:" - "\n" - " reads/s: %4.2f\n" - " writes/s: %4.2f\n" - " fsyncs/s: %4.2f\n" - "\n" - "Throughput:" - "\n" - " read, MiB/s: %4.2f\n" - " write, MiB/s: %4.2f", - stat->reads / seconds, stat->writes / seconds, stat->other / seconds, + "Throughput:\n" + " read: IOPS=%4.2f %4.2f MiB/s (%4.2f MB/s)\n" + " write: IOPS=%4.2f %4.2f MiB/s (%4.2f MB/s)\n" + " fsync: IOPS=%4.2f", + stat->reads / seconds, + stat->bytes_read / mebibyte / seconds, stat->bytes_read / megabyte / seconds, - stat->bytes_written / megabyte / seconds); + stat->writes / seconds, + stat->bytes_written / mebibyte / seconds, + stat->bytes_written / megabyte / seconds, + stat->other / seconds + ); - sb_report_cumulative(stat); + log_text(LOG_NOTICE, ""); + + log_text(LOG_NOTICE, "Latency (ms):"); + log_text(LOG_NOTICE, " min: %10.2f", + SEC2MS(stat->latency_min)); + log_text(LOG_NOTICE, " avg: %10.2f", + SEC2MS(stat->latency_avg)); + log_text(LOG_NOTICE, " max: %10.2f", + SEC2MS(stat->latency_max)); + + if (sb_globals.percentile > 0) + log_text(LOG_NOTICE, " %3dth percentile: %10.2f", + sb_globals.percentile, SEC2MS(stat->latency_pct)); + else + log_text(LOG_NOTICE, " percentile stats: disabled"); + + log_text(LOG_NOTICE, ""); } /* Return name for I/O mode */ @@ -1031,7 +1047,7 @@ int create_files(void) if (written > 0) log_text(LOG_NOTICE, "%llu bytes written in %.2f seconds (%.2f MiB/sec).", written, seconds, - (double) (written / megabyte) / seconds); + (double) (written / mebibyte) / seconds); else log_text(LOG_NOTICE, "No bytes written."); diff --git a/tests/t/api_legacy_sql.t b/tests/t/api_legacy_sql.t index a568017..fb63b04 100644 --- a/tests/t/api_legacy_sql.t +++ b/tests/t/api_legacy_sql.t @@ -202,8 +202,9 @@ Legacy SQL Lua API tests ignored errors: 0 (* per sec.) (glob) reconnects: 0 (* per sec.) (glob) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -211,7 +212,6 @@ Legacy SQL Lua API tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): */* (glob) @@ -390,8 +390,9 @@ Legacy SQL Lua API tests ignored errors: 0 (* per sec.) (glob) reconnects: 0 (* per sec.) (glob) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -399,7 +400,6 @@ Legacy SQL Lua API tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): */* (glob) diff --git a/tests/t/cmdline.t b/tests/t/cmdline.t index 01bbab6..b064030 100644 --- a/tests/t/cmdline.t +++ b/tests/t/cmdline.t @@ -72,8 +72,9 @@ event function - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed:*s (glob) total number of events: 1 Latency (ms): @@ -81,7 +82,6 @@ avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): 1.0000/0.00 @@ -282,8 +282,9 @@ Command line options tests dash-opt val - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 1 Latency (ms): @@ -291,7 +292,6 @@ Command line options tests avg: * (glob) max: * (glob) 95th percentile: * (glob) - sum: * (glob) Threads fairness: events (avg/stddev): 1.0000/0.00 diff --git a/tests/t/drv_mysql.t b/tests/t/drv_mysql.t index ac51d6e..2359951 100644 --- a/tests/t/drv_mysql.t +++ b/tests/t/drv_mysql.t @@ -26,8 +26,9 @@ MySQL driver tests ignored errors: 0 (0.00 per sec.) reconnects: 0 (0.00 per sec.) - General statistics: - total time: *.*s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *.*s (glob) total number of events: 10 Latency (ms): @@ -35,7 +36,6 @@ MySQL driver tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): *.*/*.* (glob) diff --git a/tests/t/drv_pgsql.t b/tests/t/drv_pgsql.t index af7b967..c701e89 100644 --- a/tests/t/drv_pgsql.t +++ b/tests/t/drv_pgsql.t @@ -26,8 +26,9 @@ PostgreSQL driver tests ignored errors: 0 (0.00 per sec.) reconnects: 0 (0.00 per sec.) - General statistics: - total time: *.*s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *.*s (glob) total number of events: 10 Latency (ms): @@ -35,7 +36,6 @@ PostgreSQL driver tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): *.*/*.* (glob) diff --git a/tests/t/opt_histogram.t b/tests/t/opt_histogram.t index ec2de6b..e36b84e 100644 --- a/tests/t/opt_histogram.t +++ b/tests/t/opt_histogram.t @@ -33,8 +33,9 @@ * |\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\* 1 (glob) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 2 Latency (ms): @@ -42,7 +43,6 @@ avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): 1.0000/0.00 diff --git a/tests/t/opt_warmup_time.t b/tests/t/opt_warmup_time.t index 5de5e83..2eac46f 100644 --- a/tests/t/opt_warmup_time.t +++ b/tests/t/opt_warmup_time.t @@ -37,8 +37,9 @@ Warming up for 1 seconds... - General statistics: - total time: 2.*s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: 2.*s (glob) total number of events: 2 Latency (ms): @@ -46,7 +47,6 @@ avg: * (glob) max: * (glob) 95th percentile: * (glob) - sum: * (glob) Threads fairness: events (avg/stddev): */* (glob) @@ -68,8 +68,9 @@ Warming up for 1 seconds... - General statistics: - total time: 5.*s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: 5.*s (glob) total number of events: 5 Latency (ms): @@ -77,7 +78,6 @@ avg: * (glob) max: * (glob) 95th percentile: * (glob) - sum: * (glob) Threads fairness: events (avg/stddev): */* (glob) diff --git a/tests/t/script_bulk_insert_mysql.t b/tests/t/script_bulk_insert_mysql.t index bc2a34d..0a7829d 100644 --- a/tests/t/script_bulk_insert_mysql.t +++ b/tests/t/script_bulk_insert_mysql.t @@ -43,8 +43,9 @@ bulk_insert.lua + MySQL tests ignored errors: 0 (0.00 per sec.) reconnects: 0 (0.00 per sec.) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -52,7 +53,6 @@ bulk_insert.lua + MySQL tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev):* (glob) diff --git a/tests/t/script_bulk_insert_pgsql.t b/tests/t/script_bulk_insert_pgsql.t index f72f49a..e108ed9 100644 --- a/tests/t/script_bulk_insert_pgsql.t +++ b/tests/t/script_bulk_insert_pgsql.t @@ -45,8 +45,9 @@ bulk_insert.lua + PostgreSQL tests ignored errors: 0 (0.00 per sec.) reconnects: 0 (0.00 per sec.) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -54,7 +55,6 @@ bulk_insert.lua + PostgreSQL tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev):* (glob) diff --git a/tests/t/script_oltp_delete_mysql.t b/tests/t/script_oltp_delete_mysql.t index dafac47..5358260 100644 --- a/tests/t/script_oltp_delete_mysql.t +++ b/tests/t/script_oltp_delete_mysql.t @@ -144,8 +144,9 @@ oltp_delete.lua + MySQL tests ignored errors: 0 (* per sec.) (glob) reconnects: 0 (* per sec.) (glob) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -153,7 +154,6 @@ oltp_delete.lua + MySQL tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): */* (glob) diff --git a/tests/t/script_oltp_delete_pgsql.t b/tests/t/script_oltp_delete_pgsql.t index 414aec5..304ba7d 100644 --- a/tests/t/script_oltp_delete_pgsql.t +++ b/tests/t/script_oltp_delete_pgsql.t @@ -145,8 +145,9 @@ oltp_delete.lua + PostgreSQL tests ignored errors: 0 (* per sec.) (glob) reconnects: 0 (* per sec.) (glob) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -154,7 +155,6 @@ oltp_delete.lua + PostgreSQL tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): */* (glob) diff --git a/tests/t/script_oltp_insert_mysql.t b/tests/t/script_oltp_insert_mysql.t index 068753d..070275f 100644 --- a/tests/t/script_oltp_insert_mysql.t +++ b/tests/t/script_oltp_insert_mysql.t @@ -144,8 +144,9 @@ oltp_insert.lua + MySQL tests ignored errors: 0 (* per sec.) (glob) reconnects: 0 (* per sec.) (glob) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -153,7 +154,6 @@ oltp_insert.lua + MySQL tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): */* (glob) diff --git a/tests/t/script_oltp_insert_pgsql.t b/tests/t/script_oltp_insert_pgsql.t index 827d9ca..90c0553 100644 --- a/tests/t/script_oltp_insert_pgsql.t +++ b/tests/t/script_oltp_insert_pgsql.t @@ -145,8 +145,9 @@ oltp_insert.lua + PostgreSQL tests ignored errors: 0 (* per sec.) (glob) reconnects: 0 (* per sec.) (glob) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -154,7 +155,6 @@ oltp_insert.lua + PostgreSQL tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): */* (glob) diff --git a/tests/t/script_oltp_point_select_mysql.t b/tests/t/script_oltp_point_select_mysql.t index 9145d9f..43bc216 100644 --- a/tests/t/script_oltp_point_select_mysql.t +++ b/tests/t/script_oltp_point_select_mysql.t @@ -144,8 +144,9 @@ oltp_point_select.lua + MySQL tests ignored errors: 0 (* per sec.) (glob) reconnects: 0 (* per sec.) (glob) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -153,7 +154,6 @@ oltp_point_select.lua + MySQL tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): */* (glob) diff --git a/tests/t/script_oltp_point_select_pgsql.t b/tests/t/script_oltp_point_select_pgsql.t index a9dbc1b..59b54a9 100644 --- a/tests/t/script_oltp_point_select_pgsql.t +++ b/tests/t/script_oltp_point_select_pgsql.t @@ -145,8 +145,9 @@ oltp_point_select.lua + PostgreSQL tests ignored errors: 0 (* per sec.) (glob) reconnects: 0 (* per sec.) (glob) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -154,7 +155,6 @@ oltp_point_select.lua + PostgreSQL tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): */* (glob) diff --git a/tests/t/script_oltp_read_write_mysql.t b/tests/t/script_oltp_read_write_mysql.t index 1de56d3..ac1e706 100644 --- a/tests/t/script_oltp_read_write_mysql.t +++ b/tests/t/script_oltp_read_write_mysql.t @@ -148,8 +148,9 @@ oltp_read_write.lua + MySQL tests ignored errors: 0 (* per sec.) (glob) reconnects: 0 (* per sec.) (glob) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -157,7 +158,6 @@ oltp_read_write.lua + MySQL tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): */* (glob) @@ -345,8 +345,9 @@ oltp_read_write.lua + MySQL tests ignored errors: 0 (* per sec.) (glob) reconnects: 0 (* per sec.) (glob) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -354,7 +355,6 @@ oltp_read_write.lua + MySQL tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): */* (glob) diff --git a/tests/t/script_oltp_read_write_pgsql.t b/tests/t/script_oltp_read_write_pgsql.t index 6973bc3..d3e4839 100644 --- a/tests/t/script_oltp_read_write_pgsql.t +++ b/tests/t/script_oltp_read_write_pgsql.t @@ -148,8 +148,9 @@ oltp_read_write.lua + PostgreSQL tests ignored errors: 0 (* per sec.) (glob) reconnects: 0 (* per sec.) (glob) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -157,7 +158,6 @@ oltp_read_write.lua + PostgreSQL tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): */* (glob) diff --git a/tests/t/script_select_random_mysql.t b/tests/t/script_select_random_mysql.t index 7aea877..317cc4c 100644 --- a/tests/t/script_select_random_mysql.t +++ b/tests/t/script_select_random_mysql.t @@ -48,8 +48,9 @@ select_random_*.lua + MySQL tests ignored errors: 0 (0.00 per sec.) reconnects: 0 (0.00 per sec.) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -57,7 +58,6 @@ select_random_*.lua + MySQL tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev):* (glob) @@ -118,8 +118,9 @@ select_random_*.lua + MySQL tests ignored errors: 0 (0.00 per sec.) reconnects: 0 (0.00 per sec.) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -127,7 +128,6 @@ select_random_*.lua + MySQL tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev):* (glob) diff --git a/tests/t/script_select_random_pgsql.t b/tests/t/script_select_random_pgsql.t index 4286277..521bf2b 100644 --- a/tests/t/script_select_random_pgsql.t +++ b/tests/t/script_select_random_pgsql.t @@ -49,8 +49,9 @@ select_random_*.lua + PostgreSQL tests ignored errors: 0 (0.00 per sec.) reconnects: 0 (0.00 per sec.) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -58,7 +59,6 @@ select_random_*.lua + PostgreSQL tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev):* (glob) @@ -120,8 +120,9 @@ select_random_*.lua + PostgreSQL tests ignored errors: 0 (0.00 per sec.) reconnects: 0 (0.00 per sec.) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -129,7 +130,6 @@ select_random_*.lua + PostgreSQL tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev):* (glob) diff --git a/tests/t/test_cpu.t b/tests/t/test_cpu.t index 61eb725..0e36c57 100644 --- a/tests/t/test_cpu.t +++ b/tests/t/test_cpu.t @@ -30,8 +30,9 @@ cpu benchmark tests CPU speed: events per second: *.* (glob) - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -39,7 +40,6 @@ cpu benchmark tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): 50.0000/* (glob) diff --git a/tests/t/test_fileio.t b/tests/t/test_fileio.t index c0c16d0..c5afcbb 100644 --- a/tests/t/test_fileio.t +++ b/tests/t/test_fileio.t @@ -57,29 +57,16 @@ fileio benchmark tests Threads started! - File operations: - reads/s: *.* (glob) - writes/s: *.* (glob) - fsyncs/s: *.* (glob) - Throughput: - read, MiB/s: *.* (glob) - write, MiB/s: *.* (glob) - - General statistics: - total time: *.*s (glob) - total number of events: 158 + read: IOPS=*.* *.* MiB/s (*.* MB/s) (glob) + write: IOPS=*.* *.* MiB/s (*.* MB/s) (glob) + fsync: IOPS=*.* (glob) Latency (ms): min: *.* (glob) avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) - - Threads fairness: - events (avg/stddev): 158.0000/0.00 - execution time (avg/stddev): *.*/0.00 (glob) $ sysbench $fileio_args --events=150 --file-test-mode=rndrd run sysbench *.* * (glob) @@ -104,29 +91,16 @@ fileio benchmark tests Threads started! - File operations: - reads/s: *.* (glob) - writes/s: 0.00 - fsyncs/s: 0.00 - Throughput: - read, MiB/s: *.* (glob) - write, MiB/s: 0.00 - - General statistics: - total time: *.*s (glob) - total number of events: 150 + read: IOPS=*.* *.* MiB/s (*.* MB/s) (glob) + write: IOPS=*.* *.* MiB/s (*.* MB/s) (glob) + fsync: IOPS=*.* (glob) Latency (ms): min: *.* (glob) avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) - - Threads fairness: - events (avg/stddev): 150.0000/0.00 - execution time (avg/stddev): *.*/0.00 (glob) $ sysbench $fileio_args --events=150 --file-test-mode=seqrd run @@ -150,29 +124,16 @@ fileio benchmark tests Threads started! - File operations: - reads/s: *.* (glob) - writes/s: 0.00 - fsyncs/s: 0.00 - Throughput: - read, MiB/s: *.* (glob) - write, MiB/s: 0.00 - - General statistics: - total time: *.*s (glob) - total number of events: 150 + read: IOPS=*.* *.* MiB/s (*.* MB/s) (glob) + write: IOPS=*.* *.* MiB/s (*.* MB/s) (glob) + fsync: IOPS=*.* (glob) Latency (ms): min: *.* (glob) avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) - - Threads fairness: - events (avg/stddev): 150.0000/0.00 - execution time (avg/stddev): *.*/0.00 (glob) $ sysbench $fileio_args --events=150 --file-test-mode=rndwr run @@ -198,29 +159,16 @@ fileio benchmark tests Threads started! - File operations: - reads/s: 0.00 - writes/s: *.* (glob) - fsyncs/s: *.* (glob) - Throughput: - read, MiB/s: 0.00 - write, MiB/s: *.* (glob) - - General statistics: - total time: *.*s (glob) - total number of events: 158 + read: IOPS=*.* *.* MiB/s (*.* MB/s) (glob) + write: IOPS=*.* *.* MiB/s (*.* MB/s) (glob) + fsync: IOPS=*.* (glob) Latency (ms): min: *.* (glob) avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) - - Threads fairness: - events (avg/stddev): 158.0000/0.00 - execution time (avg/stddev): *.*/0.00 (glob) $ sysbench $fileio_args --events=150 --file-test-mode=foo run diff --git a/tests/t/test_memory.t b/tests/t/test_memory.t index c20832b..eedcce1 100644 --- a/tests/t/test_memory.t +++ b/tests/t/test_memory.t @@ -82,16 +82,16 @@ help' only on Linux. 1024.00 MiB transferred (* MiB/sec) (glob) - General statistics: - total time: *s (glob) - total number of events: 262144 (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) + total number of events: 262144 Latency (ms): min: *.* (glob) avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): */* (glob) @@ -124,16 +124,16 @@ help' only on Linux. 1024.00 MiB transferred (* MiB/sec) (glob) - General statistics: - total time: *s (glob) - total number of events: 262144 (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) + total number of events: 262144 Latency (ms): min: *.* (glob) avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): */* (glob) @@ -166,16 +166,16 @@ help' only on Linux. 1024.00 MiB transferred (* MiB/sec) (glob) - General statistics: - total time: *s (glob) - total number of events: 262144 (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) + total number of events: 262144 Latency (ms): min: *.* (glob) avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): */* (glob) @@ -208,16 +208,16 @@ help' only on Linux. 1024.00 MiB transferred (* MiB/sec) (glob) - General statistics: - total time: *s (glob) - total number of events: 262144 (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) + total number of events: 262144 Latency (ms): min: *.* (glob) avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): */* (glob) diff --git a/tests/t/test_mutex.t b/tests/t/test_mutex.t index 428f500..5021fda 100644 --- a/tests/t/test_mutex.t +++ b/tests/t/test_mutex.t @@ -28,8 +28,9 @@ mutex benchmark tests Threads started! - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 2 Latency (ms): @@ -37,7 +38,6 @@ mutex benchmark tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): */* (glob) diff --git a/tests/t/test_threads.t b/tests/t/test_threads.t index 34c8f0c..75b4286 100644 --- a/tests/t/test_threads.t +++ b/tests/t/test_threads.t @@ -28,8 +28,9 @@ threads benchmark tests Threads started! - General statistics: - total time: *s (glob) + Throughput: + events/s (eps): *.* (glob) + time elapsed: *s (glob) total number of events: 100 Latency (ms): @@ -37,7 +38,6 @@ threads benchmark tests avg: *.* (glob) max: *.* (glob) 95th percentile: *.* (glob) - sum: *.* (glob) Threads fairness: events (avg/stddev): */* (glob)