Calculate and print out the standard deviation of the round trip times.

This isn't necessarily the best statistic, but it is by far the easiest to
calculate.  Update the man page to be more explicit about precisely which
statistics are printed out.  Revert some of jmg's bogus man page changes from
rev 1.11.

3 files changed, 33 insertions, 19 deletions

diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index a4a3685..4723926 100644
--- a/sbin/ping/Makefile
+++ b/sbin/ping/Makefile
@@ -5,5 +5,6 @@ MAN8=	ping.8
 BINOWN=	root
 BINMODE=4555
 COPTS+=	-Wall -Wmissing-prototypes
+LDADD=	-lm
 
 .include <bsd.prog.mk>
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index 6539352..9d217e4 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
-.\"	$Id: ping.8,v 1.10 1997/03/02 20:01:07 imp Exp $
+.\"	$Id: ping.8,v 1.11 1997/03/02 23:38:05 jmg Exp $
 .\"
 .Dd March 1, 1997
 .Dt PING 8
@@ -214,12 +214,14 @@ Then, hosts and gateways further and further away should be
 Round-trip times and packet loss statistics are computed.
 If duplicate packets are received, they are not included in the packet
 loss calculation, although the round trip time of these packets is used
-in calculating the minimum/average/maximum round-trip time numbers.
+in calculating the round-trip time statistics.
 When the specified number of packets have been sent
 .Pq and received
 or if the program is terminated with a
 .Dv SIGINT ,
-a brief summary is displayed.
+a brief summary is displayed, showing the number of packets sent and
+received, and the minimum, maximum, mean, and standard deviation of
+the round-trip times.
 .Pp
 This program is intended for use in network testing, measurement and
 management.
@@ -267,25 +269,21 @@ to the same request.
 Damaged packets are obviously serious cause for alarm and often
 indicate broken hardware somewhere in the
 .Nm ping
-.No packet Ap s path
-.Pq in the network or in the hosts .
+packet's path (in the network or in the hosts).
 .Sh TRYING DIFFERENT DATA PATTERNS
 The
-.Po
-inter
-.Pc Ns network
+(inter)network
 layer should never treat packets differently depending on the data
 contained in the data portion.
 Unfortunately, data-dependent problems have been known to sneak into
 networks and remain undetected for long periods of time.
 In many cases the particular pattern that will have problems is something
-.No that doesn Ap t have sufficient
+that does not have sufficient
 .Dq transitions ,
 such as all ones or all zeros, or a pattern right at the edge, such as
 almost all zeros.
-.No It isn Ap t
-necessarily enough to specify a data pattern of all zeros
-.Pq for example
+It is not
+necessarily enough to specify a data pattern of all zeros (for example)
 on the command line because the pattern that is of interest is
 at the data link level, and the relationship between what you type and
 what the controllers transmit can be complicated.
@@ -293,7 +291,7 @@ what the controllers transmit can be complicated.
 This means that if you have a data-dependent problem you will probably
 have to do a lot of testing to find it.
 If you are lucky, you may manage to find a file that either
-.No can Ap t
+cannot
 be sent across your network or that takes much longer to transfer than
 other similar length files.
 You can then examine this file for repeated patterns that you can test
@@ -318,7 +316,12 @@ specification states that the
 field for
 .Tn TCP
 packets should be set to 60, but many systems use smaller values
-.Pq Bx 4.3 \ uses 30, Bx 4.2 \ used 15 .
+.Po
+.Bx 4.3
+uses 30,
+.Bx 4.2
+used 15
+.Pc .
 .Pp
 The maximum possible value of this field is 255, and most Unix systems set
 the
@@ -348,7 +351,9 @@ In this case the
 value in the received packet will be 255 minus the
 number of routers in the round-trip path.
 .It
-Set it to 255; this is what current Berkeley Unix systems do.
+Set it to 255; this is what current 
+.Tn BSD
+systems do.
 In this case the
 .Tn TTL
 value in the received packet will be 255 minus the
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 5479d64..b83cdbb 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 */
 static const char rcsid[] =
-	"$Id: ping.c,v 1.23 1997/07/09 20:33:58 julian Exp $";
+	"$Id: ping.c,v 1.24 1997/07/13 06:16:44 sef Exp $";
 #endif /* not lint */
 
 /*
@@ -71,6 +71,7 @@ static const char rcsid[] =
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
+#include <math.h>
 #include <netdb.h>
 #include <signal.h>
 #include <stdio.h>
@@ -155,6 +156,7 @@ int timing;			/* flag to do timing */
 double tmin = 999999999.0;	/* minimum round trip time */
 double tmax = 0.0;		/* maximum round trip time */
 double tsum = 0.0;		/* sum of all times, for doing average */
+double tsumsq = 0.0;		/* sum of all times squared, for std. dev. */
 
 int reset_kerninfo;
 sig_atomic_t siginfo_p;
@@ -649,6 +651,7 @@ pr_pack(buf, cc, from)
 			triptime = ((double)tv.tv_sec) * 1000.0 +
 			    ((double)tv.tv_usec) / 1000.0;
 			tsum += triptime;
+			tsumsq += triptime * triptime;
 			if (triptime < tmin)
 				tmin = triptime;
 			if (triptime > tmax)
@@ -922,9 +925,14 @@ finish(int sig)
 			    (int) (((ntransmitted - nreceived) * 100) /
 			    ntransmitted));
 	(void)putchar('\n');
-	if (nreceived && timing)
-		(void)printf("round-trip min/avg/max = %.3f/%.3f/%.3f ms\n",
-		    tmin, tsum / (nreceived + nrepeats), tmax);
+	if (nreceived && timing) {
+		double n = nreceived + nrepeats;
+		double avg = tsum / n;
+		double vari = tsumsq / n - avg * avg;
+		printf("round-trip min/avg/max/stddev = "
+		       "%.3f/%.3f/%.3f/%.3f ms\n",
+		    tmin, avg, tmax, sqrt(vari));
+	}
 	if (reset_kerninfo && tcgetattr(STDOUT_FILENO, &ts) != -1) {
 		ts.c_lflag &= ~NOKERNINFO;
 		tcsetattr(STDOUT_FILENO, TCSANOW, &ts);