From 7acfa8498be172b639eb6fb129cb92e384872284 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 23 Mar 2016 10:18:07 +0100 Subject: [PATCH 1/3] sb_print_value_size: use Ki, Mi, Gi, Ti Use the binary prefixes defined in IEC 80000-13. Ki, kibi = 2^10 Mi, mebi = 2^20 Gi, gibi = 2^30 Ti, tebi = 2^40 Signed-off-by: Heinrich Schuchardt --- sysbench/sb_options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysbench/sb_options.c b/sysbench/sb_options.c index bc541fc..6a18c0a 100644 --- a/sysbench/sb_options.c +++ b/sysbench/sb_options.c @@ -396,7 +396,7 @@ char *sb_print_value_size(char *buf, unsigned int buflen, double value) /* empty */ ; if (i > 0) - snprintf(buf, buflen, "%.5g%c", value, sizemods[i-1]); + snprintf(buf, buflen, "%.5g%ci", value, sizemods[i-1]); else snprintf(buf, buflen, "%.5g", value); From d373c964479f6ed24564f5c9df6a117f8f4ed33d Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 23 Mar 2016 10:25:54 +0100 Subject: [PATCH 2/3] sb_fileio.c: use correct units Use the binary prefixes defined in IEC 80000-13. Ki, kibi = 2^10 Mi, mebi = 2^20 Gi, gibi = 2^30 Ti, tebi = 2^40 Use B for Byte, b for bit. Signed-off-by: Heinrich Schuchardt --- sysbench/tests/fileio/sb_fileio.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sysbench/tests/fileio/sb_fileio.c b/sysbench/tests/fileio/sb_fileio.c index 90e98a7..b340622 100644 --- a/sysbench/tests/fileio/sb_fileio.c +++ b/sysbench/tests/fileio/sb_fileio.c @@ -801,15 +801,15 @@ void file_print_mode(void) char sizestr[16]; log_text(LOG_NOTICE, "Extra file open flags: %x", file_extra_flags); - log_text(LOG_NOTICE, "%d files, %sb each", num_files, + log_text(LOG_NOTICE, "%d files, %sB each", num_files, sb_print_value_size(sizestr, sizeof(sizestr), file_size)); - log_text(LOG_NOTICE, "%sb total file size", + log_text(LOG_NOTICE, "%sB total file size", sb_print_value_size(sizestr, sizeof(sizestr), file_size * num_files)); - log_text(LOG_NOTICE, "Block size %sb", + log_text(LOG_NOTICE, "Block size %sB", sb_print_value_size(sizestr, sizeof(sizestr), file_block_size)); if (file_merged_requests > 0) - log_text(LOG_NOTICE, "Merging requests up to %sb for sequential IO.", + log_text(LOG_NOTICE, "Merging requests up to %sB for sequential IO.", sb_print_value_size(sizestr, sizeof(sizestr), file_max_request_size)); @@ -877,7 +877,7 @@ void file_print_stats(sb_stat_t type) SB_THREAD_MUTEX_UNLOCK(); log_timestamp(LOG_NOTICE, &sb_globals.exec_timer, - "reads: %4.2f MB/s writes: %4.2f MB/s fsyncs: %4.2f/s " + "reads: %4.2f MiB/s writes: %4.2f MiB/s fsyncs: %4.2f/s " "response time: %4.3fms (%u%%)", diff_read / megabyte / seconds, diff_written / megabyte / seconds, @@ -897,8 +897,8 @@ void file_print_stats(sb_stat_t type) log_text(LOG_NOTICE, "Operations performed: %d reads, %d writes, %d Other = %d Total", read_ops, write_ops, other_ops, read_ops + write_ops + other_ops); - log_text(LOG_NOTICE, "Read %sb Written %sb Total transferred %sb " - "(%sb/sec)", + log_text(LOG_NOTICE, "Read %sB Written %sB Total transferred %sB " + "(%sB/sec)", sb_print_value_size(s1, sizeof(s1), bytes_read), sb_print_value_size(s2, sizeof(s2), bytes_written), sb_print_value_size(s3, sizeof(s3), bytes_read + bytes_written), @@ -1092,7 +1092,7 @@ int create_files(void) seconds = NS2SEC(sb_timer_value(&t)); if (written > 0) - log_text(LOG_NOTICE, "%llu bytes written in %.2f seconds (%.2f MB/sec).", + log_text(LOG_NOTICE, "%llu bytes written in %.2f seconds (%.2f MiB/sec).", written, seconds, (double) (written / megabyte) / seconds); else From c9ba61dc754932275a98aae7c569b695553e0b4f Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 23 Mar 2016 10:30:42 +0100 Subject: [PATCH 3/3] sb_memory.c: use correct units Use the binary prefixes defined in IEC 80000-13. Ki, kibi = 2^10 Mi, mebi = 2^20 Use B for bytes. Signed-off-by: Heinrich Schuchardt --- sysbench/tests/memory/sb_memory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sysbench/tests/memory/sb_memory.c b/sysbench/tests/memory/sb_memory.c index 50f042c..ba73dff 100644 --- a/sysbench/tests/memory/sb_memory.c +++ b/sysbench/tests/memory/sb_memory.c @@ -322,9 +322,9 @@ void memory_print_mode(void) char *str; log_text(LOG_INFO, "Doing memory operations speed test"); - log_text(LOG_INFO, "Memory block size: %ldK\n", + log_text(LOG_INFO, "Memory block size: %ldKiB\n", (long)(memory_block_size / 1024)); - log_text(LOG_INFO, "Memory transfer size: %ldM\n", + log_text(LOG_INFO, "Memory transfer size: %ldMiB\n", (long)(memory_total_size / 1024 / 1024)); switch (memory_oper) { @@ -369,7 +369,7 @@ void memory_print_stats(sb_stat_t type) seconds = NS2SEC(sb_timer_split(&sb_globals.exec_timer)); log_timestamp(LOG_NOTICE, &sb_globals.exec_timer, - "%4.2f MB/sec,", + "%4.2f MiB/sec,", (double)(total_bytes - last_bytes) / megabyte / seconds); last_bytes = total_bytes; SB_THREAD_MUTEX_UNLOCK(); @@ -382,7 +382,7 @@ void memory_print_stats(sb_stat_t type) log_text(LOG_NOTICE, "Operations performed: %d (%8.2f ops/sec)\n", total_ops, total_ops / seconds); if (memory_oper != SB_MEM_OP_NONE) - log_text(LOG_NOTICE, "%4.2f MB transferred (%4.2f MB/sec)\n", + log_text(LOG_NOTICE, "%4.2f MiB transferred (%4.2f MiB/sec)\n", total_bytes / megabyte, total_bytes / megabyte / seconds); total_ops = 0;