vitalif
/
mdtest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #84 from DDNStorage/fixshortsummary 

Fix bug in computing max write and read bandwidths
master
Julian Kunkel 2018-09-19 10:25:29 +01:00 committed by GitHub
parent fd34b08e05 44e8f03917
commit 6881138edb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ior-output.c
View File

@ -612,8 +612,8 @@ void PrintShortSummary(IOR_test_t * test)
{ {
IOR_param_t *params = &test->params; IOR_param_t *params = &test->params;
IOR_results_t *results = test->results; IOR_results_t *results = test->results;
double max_write = 0.0; double max_write_bw = 0.0;
double max_read = 0.0; double max_read_bw = 0.0;
double bw; double bw;
int reps; int reps;
int i; int i;
@ -625,33 +625,31 @@ void PrintShortSummary(IOR_test_t * test)
reps = params->repetitions; reps = params->repetitions;
max_write = results[0].writeTime;
max_read = results[0].readTime;
for (i = 0; i < reps; i++) { for (i = 0; i < reps; i++) {
bw = (double)results[i].aggFileSizeForBW / results[i].writeTime; bw = (double)results[i].aggFileSizeForBW / results[i].writeTime;
max_write = MAX(bw, max_write); max_write_bw = MAX(bw, max_write_bw);
bw = (double)results[i].aggFileSizeForBW / results[i].readTime; bw = (double)results[i].aggFileSizeForBW / results[i].readTime;
max_read = MAX(bw, max_read); max_read_bw = MAX(bw, max_read_bw);
} }
if(outputFormat == OUTPUT_DEFAULT){ if(outputFormat == OUTPUT_DEFAULT){
if (params->writeFile) { if (params->writeFile) {
fprintf(out_resultfile, "Max Write: %.2f MiB/sec (%.2f MB/sec)\n", fprintf(out_resultfile, "Max Write: %.2f MiB/sec (%.2f MB/sec)\n",
max_write/MEBIBYTE, max_write/MEGABYTE); max_write_bw/MEBIBYTE, max_write_bw/MEGABYTE);
} }
if (params->readFile) { if (params->readFile) {
fprintf(out_resultfile, "Max Read: %.2f MiB/sec (%.2f MB/sec)\n", fprintf(out_resultfile, "Max Read: %.2f MiB/sec (%.2f MB/sec)\n",
max_read/MEBIBYTE, max_read/MEGABYTE); max_read_bw/MEBIBYTE, max_read_bw/MEGABYTE);
} }
}else if (outputFormat == OUTPUT_JSON){ }else if (outputFormat == OUTPUT_JSON){
PrintNamedSectionStart("max"); PrintNamedSectionStart("max");
if (params->writeFile) { if (params->writeFile) {
PrintKeyValDouble("writeMiB", max_write/MEBIBYTE); PrintKeyValDouble("writeMiB", max_write_bw/MEBIBYTE);
PrintKeyValDouble("writeMB", max_write/MEGABYTE); PrintKeyValDouble("writeMB", max_write_bw/MEGABYTE);
} }
if (params->readFile) { if (params->readFile) {
PrintKeyValDouble("readMiB", max_read/MEBIBYTE); PrintKeyValDouble("readMiB", max_read_bw/MEBIBYTE);
PrintKeyValDouble("readMB", max_read/MEGABYTE); PrintKeyValDouble("readMB", max_read_bw/MEGABYTE);
} }
PrintEndSection(); PrintEndSection();
} }