===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tcpbench/tcpbench.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -c -r1.35 -r1.36
*** src/usr.bin/tcpbench/tcpbench.c	2012/05/08 01:39:58	1.35
--- src/usr.bin/tcpbench/tcpbench.c	2012/06/16 17:18:11	1.36
***************
*** 568,574 ****
  		mainstats.peak_mbps = slice_mbps;
  	printf("Conn: %3d Mbps: %12.3Lf Peak Mbps: %12.3Lf Avg Mbps: %12.3Lf\n",
  	    mainstats.nconns, slice_mbps, mainstats.peak_mbps,
! 	    slice_mbps / mainstats.nconns); 
  	mainstats.slice_bytes = 0;
  
  	set_slice_timer(mainstats.nconns > 0);
--- 568,574 ----
  		mainstats.peak_mbps = slice_mbps;
  	printf("Conn: %3d Mbps: %12.3Lf Peak Mbps: %12.3Lf Avg Mbps: %12.3Lf\n",
  	    mainstats.nconns, slice_mbps, mainstats.peak_mbps,
! 	    mainstats.nconns ? slice_mbps / mainstats.nconns : 0); 
  	mainstats.slice_bytes = 0;
  
  	set_slice_timer(mainstats.nconns > 0);
***************
*** 657,663 ****
  
  		free(sc);
  		mainstats.nconns--;
- 		set_slice_timer(mainstats.nconns > 0);
  		return;
  	}
  	if (ptb->vflag >= 3)
--- 657,662 ----
***************
*** 723,729 ****
  	event_add(&sc->ev, NULL);
  	TAILQ_INSERT_TAIL(&sc_queue, sc, entry);
  	mainstats.nconns++;
! 	set_slice_timer(mainstats.nconns > 0);
  	if (ptb->vflag)
  		fprintf(stderr, "Accepted connection from %s, fd = %d\n",
  		    tmp, sc->fd);
--- 722,729 ----
  	event_add(&sc->ev, NULL);
  	TAILQ_INSERT_TAIL(&sc_queue, sc, entry);
  	mainstats.nconns++;
! 	if (mainstats.nconns == 1)
! 		set_slice_timer(1);
  	if (ptb->vflag)
  		fprintf(stderr, "Accepted connection from %s, fd = %d\n",
  		    tmp, sc->fd);
***************
*** 934,940 ****
  		event_add(&sc->ev, NULL);
  		TAILQ_INSERT_TAIL(&sc_queue, sc, entry);
  		mainstats.nconns++;
! 		set_slice_timer(mainstats.nconns > 0);
  	}
  	freeaddrinfo(aitop);
  	if (aib != NULL)
--- 934,941 ----
  		event_add(&sc->ev, NULL);
  		TAILQ_INSERT_TAIL(&sc_queue, sc, entry);
  		mainstats.nconns++;
! 		if (mainstats.nconns == 1)
! 			set_slice_timer(1);
  	}
  	freeaddrinfo(aitop);
  	if (aib != NULL)