[ipbench-cvs] ipbench2/src/tests/nfs_latency nfs_latency.c, 1.18, 1.19

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/nfs_latency
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26623/src/tests/nfs_latency

Modified Files:
	nfs_latency.c 
Log Message:
Fix end-test condition.


Index: nfs_latency.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/nfs_latency.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** nfs_latency.c	10 Feb 2010 02:02:50 -0000	1.18
--- nfs_latency.c	10 Feb 2010 03:56:28 -0000	1.19
***************
*** 182,185 ****
--- 182,186 ----
  		delta = tick_to_usec(now - start_time);
  		predicted_requests = (delta * nfs_options.rate) / US_PER_S;
+ 
  		if (predicted_requests > requests){
  			r = generate_request(now);
***************
*** 191,195 ****
  		}
  
! 		if (process_reply(&then) == 0 && now > warmup_time && cooldown_time == 0){
  			if (offset == 0) {
  				dbprintf("Warmup done, start test\n");
--- 192,196 ----
  		}
  
! 		if ((process_reply(&then) == 0) && (now > warmup_time) && (cooldown_time == 0)){
  			if (offset == 0) {
  				dbprintf("Warmup done, start test\n");
***************
*** 201,212 ****
  		}
  
! 		if (replies >= target) {
  			cooldown_time = now;
  			result.sends = requests - offset;
! 			end_time = cooldown_time + cooldown;
  		}
  	}
  
- 	end_time = time_stamp();
  	result.microseconds = tick_to_usec(cooldown_time - warmup_time);
  	result.recvs = replies;	
--- 202,214 ----
  		}
  
! 		if (replies == target && cooldown_time == 0) {
  			cooldown_time = now;
  			result.sends = requests - offset;
! 			end_time = now + cooldown;
! 			dbprintf("Starting cooldown; now=%lld, end=%lld\n",
! 				 now, end_time);
  		}
  	}
  
  	result.microseconds = tick_to_usec(cooldown_time - warmup_time);
  	result.recvs = replies;