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

JSON: Slight output adaption.

master
Julian M. Kunkel 2018-07-09 16:25:35 +01:00
parent 0f17d4860f
commit 831a5ef823
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/ior-output.c
View File

@ -167,7 +167,15 @@ static void PrintEndSection(){
needNextToken = 1; needNextToken = 1;
} }
static void PrintArrayStart(char * key){ static void PrintArrayStart(){
PrintNextToken();
needNextToken = 0;
if(outputFormat == OUTPUT_JSON){
fprintf(out_resultfile, "[ ");
}
}
static void PrintArrayNamedStart(char * key){
PrintNextToken(); PrintNextToken();
needNextToken = 0; needNextToken = 0;
if(outputFormat == OUTPUT_JSON){ if(outputFormat == OUTPUT_JSON){
@ -184,14 +192,14 @@ static void PrintArrayEnd(){
} }
void PrintRepeatEnd(){ void PrintRepeatEnd(){
PrintEndSection(); PrintArrayEnd();
} }
void PrintRepeatStart(){ void PrintRepeatStart(){
if( outputFormat == OUTPUT_DEFAULT){ if( outputFormat == OUTPUT_DEFAULT){
return; return;
} }
PrintStartSection(); PrintArrayStart();
} }
void PrintTestEnds(){ void PrintTestEnds(){
@ -216,6 +224,7 @@ void PrintReducedResult(IOR_test_t *test, int access, double bw, double *diff_su
PPDouble(1, totalTime, " "); PPDouble(1, totalTime, " ");
fprintf(out_resultfile, "%-4d\n", rep); fprintf(out_resultfile, "%-4d\n", rep);
}else if (outputFormat == OUTPUT_JSON){ }else if (outputFormat == OUTPUT_JSON){
PrintStartSection();
PrintKeyVal("access", access == WRITE ? "write" : "read"); PrintKeyVal("access", access == WRITE ? "write" : "read");
PrintKeyValDouble("bwMiB", bw / MEBIBYTE); PrintKeyValDouble("bwMiB", bw / MEBIBYTE);
PrintKeyValDouble("blockKiB", (double)test->params.blockSize / KIBIBYTE); PrintKeyValDouble("blockKiB", (double)test->params.blockSize / KIBIBYTE);
@ -224,6 +233,7 @@ void PrintReducedResult(IOR_test_t *test, int access, double bw, double *diff_su
PrintKeyValDouble("wrRdTime", diff_subset[1]); PrintKeyValDouble("wrRdTime", diff_subset[1]);
PrintKeyValDouble("closeTime", diff_subset[2]); PrintKeyValDouble("closeTime", diff_subset[2]);
PrintKeyValDouble("totalTime", totalTime); PrintKeyValDouble("totalTime", totalTime);
PrintEndSection();
} }
fflush(out_resultfile); fflush(out_resultfile);
} }
@ -296,7 +306,7 @@ void PrintHeader(int argc, char **argv)
fprintf(out_logfile, "ENDING ENVIRON LOOP\n"); fprintf(out_logfile, "ENDING ENVIRON LOOP\n");
} }
PrintArrayStart("tests"); PrintArrayNamedStart("tests");
fflush(out_resultfile); fflush(out_resultfile);
fflush(out_logfile); fflush(out_logfile);
} }
@ -689,7 +699,10 @@ void PrintRemoveTiming(double start, double finish, int rep)
PPDouble(1, finish-start, " "); PPDouble(1, finish-start, " ");
fprintf(out_resultfile, "%-4d\n", rep); fprintf(out_resultfile, "%-4d\n", rep);
}else if (outputFormat == OUTPUT_JSON){ }else if (outputFormat == OUTPUT_JSON){
PrintKeyValDouble("removeTime", finish - start); PrintStartSection();
PrintKeyVal("access", "remove");
PrintKeyValDouble("totalTime", finish - start);
PrintEndSection();
} }
} }