[ipbench-cvs] ipbench2/src/tests/nfs_latency nfs_latency.c,1.9,1.10

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

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

Modified Files:
	nfs_latency.c 
Log Message:
improve output


Index: nfs_latency.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/nfs_latency.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** nfs_latency.c	19 Aug 2005 06:11:01 -0000	1.9
--- nfs_latency.c	23 Aug 2005 00:13:25 -0000	1.10
***************
*** 160,164 ****
  				requests++;
  			}else{
! 				printf("generate request failed\n");
  			}
  		}
--- 160,164 ----
  				requests++;
  			}else{
! 				dbprintf("generate request failed\n");
  			}
  		}
***************
*** 167,171 ****
  			replies++;
  			sample[i] = now - then;
- 			//dbprintf("delta = %ld\n", sample[i]);
  			i++;
  		}
--- 167,170 ----
***************
*** 225,230 ****
  	}
  
- 	printf("marshalling %lld samples\n", samples);
- 
  	for(i=0; i<samples; i++){
  		/* XXX is sample[i] in uS? */
--- 224,227 ----
***************
*** 277,284 ****
--- 274,283 ----
  	theresult->recvs   = ntohll(theresult->recvs);
  
+ #if 0
  	printf("got %lld time\n", theresult->time);
  	printf("got %lld samples\n", theresult->samples);
  	printf("got %lld sends\n", theresult->sends);
  	printf("got %lld recvs\n", theresult->recvs);
+ #endif
  
  	for(i=0; i<theresult->samples; i++){
***************
*** 294,299 ****
  	}
  
- 	printf("input_len=%d, *data_len=%d\n", input_len, *data_len);
- 
  	assert(input_len==*data_len);
  
--- 293,296 ----
***************
*** 370,373 ****
--- 367,382 ----
  	assert(runtime!=NULL);
  
+ 	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++) {
  		int j;
***************
*** 376,379 ****
--- 385,389 ----
  		theresult = (struct marshalled_result*)data[i].data;
  
+ #if 0
  		printf("load generator %d...\n", i);
  		printf("size is %d\n", data[i].size);
***************
*** 383,386 ****
--- 393,397 ----
  		printf("reples=%lld\n", theresult->recvs);
  		printf("samples=%lld\n", theresult->samples);
+ #endif
  
  		tot_requests += theresult->sends;
***************
*** 414,430 ****
  	avg_latency = average_uint64(aggregate, aggregate_count);
  
! 	printf("Min runtime: %lld\n", runtime[0]);
! 	printf("Average runtime: %lld\n", avg_runtime);
! 	printf("Median runtime: %lld\n", runtime[nelem/2]);
! 	printf("Max runtime: %lld\n", runtime[nelem-1]);
! 	printf("Min latency: %lld\n", aggregate[0]);
! 	printf("Average latency: %lld\n", avg_latency);
! 	printf("Median latency: %lld\n", aggregate[aggregate_count/2]);
! 	printf("Max latency: %lld\n", aggregate[aggregate_count-1]);
! 	printf("Samples: %lld\n", aggregate_count);
! 	printf("Achieved request rate (avg): %lld\n",
! 	       (tot_requests*1000000) / avg_runtime);
! 	printf("Achieved reply rate (avg): %lld\n",
! 	       (tot_replies*1000000) / avg_runtime);
  
  	dbprintf ("NFS_LATENCY DONE\n");
--- 425,440 ----
  	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);
! 	printf("%lld,", aggregate[aggregate_count/2]);
! 	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");
  
  	dbprintf ("NFS_LATENCY DONE\n");