Page MenuHomeFreeBSD
Files F96095745

D38485.id117171.diff
No OneTemporary
Actions

D38485.id117171.diff
View Options

diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1486,12 +1486,32 @@
if (siginfo_p) {
siginfo_p = 0;
- (void)fprintf(stderr, "\r%ld/%ld packets received (%.1f%%)",
- nreceived, ntransmitted,
- ntransmitted ? nreceived * 100.0 / ntransmitted : 0.0);
- if (nreceived && timing)
- (void)fprintf(stderr, " %.3f min / %.3f avg / %.3f max",
- tmin, tsum / (nreceived + nrepeats), tmax);
+ (void)fprintf(stderr, "\r--- %s ping statistics ---\n", hostname);
+ (void)fprintf(stderr, "%ld packets transmitted, ", ntransmitted);
+ (void)fprintf(stderr, "%ld packets received, ", nreceived);
+ if (nrepeats)
+ (void)fprintf(stderr, "+%ld duplicates, ", nrepeats);
+ if (ntransmitted) {
+ if (nreceived > ntransmitted)
+ (void)fprintf(stderr,
+ "-- somebody's printing up packets!");
+ else
+ (void)fprintf(stderr, "%.1f%% packet loss",
+ ((ntransmitted - nreceived) * 100.0) /
+ ntransmitted);
+ }
+ if (nrcvtimeout)
+ (void)fprintf(stderr, ", %ld packets out of wait time",
+ nrcvtimeout);
+ fprintf(stderr, "\n");
+ if (nreceived && timing) {
+ double n = nreceived + nrepeats;
+ double avg = tsum / n;
+ double dev = sqrt(fmax(0, tsumsq / n - avg * avg));
+ (void)fprintf(stderr,
+ "round-trip min/avg/max/stddev = %.3f/%.3f/%.3f/%.3f ms\n",
+ tmin, avg, tmax, dev);
+ }
(void)fprintf(stderr, "\n");
}
}
@@ -1527,10 +1547,10 @@
if (nreceived && timing) {
double n = nreceived + nrepeats;
double avg = tsum / n;
- double vari = tsumsq / n - avg * avg;
+ double dev = sqrt(fmax(0, tsumsq / n - avg * avg));
(void)printf(
"round-trip min/avg/max/stddev = %.3f/%.3f/%.3f/%.3f ms\n",
- tmin, avg, tmax, sqrt(vari));
+ tmin, avg, tmax, dev);
}
if (nreceived)

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 24, 4:22 PM (11 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
12677779
Default Alt Text
D38485.id117171.diff (1 KB)

Event Timeline