[ipbench-cvs] ipbench2/src/tests/nfs_latency nfs_latency.c,1.11,1.12

[Luke M. <lu...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/nfs_latency
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3699/src/tests/nfs_latency

Modified Files:
	nfs_latency.c 
Log Message:
change order of output fields


Index: nfs_latency.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/nfs_latency.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** nfs_latency.c	24 Aug 2005 03:04:45 -0000	1.11
--- nfs_latency.c	13 Sep 2005 04:02:53 -0000	1.12
***************
*** 160,164 ****
  				requests++;
  			}else{
! 				dbprintf("generate request failed\n");
  			}
  		}
--- 160,164 ----
  				requests++;
  			}else{
! 				//dbprintf("generate request failed\n");
  			}
  		}
***************
*** 368,382 ****
  
  	printf("#");
! 	printf("Min runtime,");
! 	printf("Average runtime,");
! 	printf("Median runtime,");
! 	printf("Max runtime,");
  	printf("Min latency,");
  	printf("Average latency,");
  	printf("Median latency,");
  	printf("Max latency,");
! 	printf("Samples,");
! 	printf("Achieved request rate,");
! 	printf("Achieved reply rate");
  
  	for (i = 0; i < nelem; i++) {
--- 368,383 ----
  
  	printf("#");
! 	printf("Achieved request rate,");
! 	printf("Achieved reply rate,");
  	printf("Min latency,");
  	printf("Average latency,");
  	printf("Median latency,");
  	printf("Max latency,");
! 	printf("Samples");
! 	printf("Min runtime,");
! 	printf("Average runtime,");
! 	printf("Median runtime,");
! 	printf("Max runtime");
! 	printf("\n");
  
  	for (i = 0; i < nelem; i++) {
***************
*** 426,433 ****
  	avg_latency = average_uint64(aggregate, aggregate_count);
  
! 	printf("%lld,", runtime[0]);
! 	printf("%lld,", avg_runtime);
! 	printf("%lld,", runtime[nelem/2]);
! 	printf("%lld,", runtime[nelem-1]);
  	printf("%lld,", aggregate[0]);
  	printf("%lld,", avg_latency);
--- 427,432 ----
  	avg_latency = average_uint64(aggregate, aggregate_count);
  
! 	printf("%lld,", (tot_requests*1000000) / avg_runtime);
! 	printf("%lld,", (tot_replies*1000000) / avg_runtime);
  	printf("%lld,", aggregate[0]);
  	printf("%lld,", avg_latency);
***************
*** 435,440 ****
  	printf("%lld,", aggregate[aggregate_count-1]);
  	printf("%lld,", aggregate_count);
! 	printf("%lld,", (tot_requests*1000000) / avg_runtime);
! 	printf("%lld", (tot_replies*1000000) / avg_runtime);
  	printf("\n");
  
--- 434,441 ----
  	printf("%lld,", aggregate[aggregate_count-1]);
  	printf("%lld,", aggregate_count);
! 	printf("%lld,", runtime[0]);
! 	printf("%lld,", avg_runtime);
! 	printf("%lld,", runtime[nelem/2]);
! 	printf("%lld", runtime[nelem-1]);
  	printf("\n");