![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/oping.c b/src/oping.c
index 0649d0044bd681497a6d3e59607f8b1d71a0729e..381c8f357957a6de26dcc4a18e88f27fdd2385a4 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
/**
* Object oriented C module to send ICMP and ICMPv6 `echo's.
- * Copyright (C) 2006-2011 Florian octo Forster <ff at octo.it>
+ * Copyright (C) 2006-2014 Florian octo Forster <ff at octo.it>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#endif
#include <locale.h>
+#include <langinfo.h>
#if USE_NCURSES
# define NCURSES_OPAQUE 1
/* http://newsgroups.derkeiler.com/Archive/Rec/rec.games.roguelike.development/2010-09/msg00050.html */
# define _X_OPEN_SOURCE_EXTENDED
-# include <ncursesw/ncurses.h>
+
+# if HAVE_NCURSESW_NCURSES_H
+# include <ncursesw/ncurses.h>
+# elif HAVE_NCURSES_H
+# include <ncurses.h>
+# endif
# define OPING_GREEN 1
# define OPING_YELLOW 2
# define OPING_GREEN_HIST 4
# define OPING_YELLOW_HIST 5
# define OPING_RED_HIST 6
+
+static char const * const hist_symbols_utf8[] = {
+ "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" };
+static size_t const hist_symbols_utf8_num = sizeof (hist_symbols_utf8)
+ / sizeof (hist_symbols_utf8[0]);
+
+/* scancodes for 6 levels of horizontal bars, ncurses-specific */
+/* those are not the usual constants because those are not constant */
+static int const hist_symbols_acs[] = {
+ 115, /* ACS_S9 "⎽" */
+ 114, /* ACS_S7 "⎼" */
+ 113, /* ACS_S5 "─" */
+ 112, /* ACS_S3 "⎻" */
+ 111 /* ACS_S1 "⎺" */
+};
+static size_t const hist_symbols_acs_num = sizeof (hist_symbols_acs)
+ / sizeof (hist_symbols_acs[0]);
+
+/* use different colors without a background for scancodes */
+static int const hist_colors_utf8[] = {
+ OPING_GREEN_HIST, OPING_YELLOW_HIST, OPING_RED_HIST };
+static int const hist_colors_acs[] = {
+ OPING_GREEN, OPING_YELLOW, OPING_RED };
+/* assuming that both arrays are the same size */
+static size_t const hist_colors_num = sizeof (hist_colors_utf8)
+ / sizeof (hist_colors_utf8[0]);
#endif
-#include "oping.h"
+/* "─" */
+#define BOXPLOT_WHISKER_BAR (113 | A_ALTCHARSET)
+/* "├" */
+#define BOXPLOT_WHISKER_LEFT_END (116 | A_ALTCHARSET)
+/* "┤" */
+#define BOXPLOT_WHISKER_RIGHT_END (117 | A_ALTCHARSET)
+/* Inverted */
+#define BOXPLOT_BOX ' '
+/* "│", inverted */
+#define BOXPLOT_MEDIAN (120 | A_ALTCHARSET)
-const char *bars[BARS_LEN] = { "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" };
+#include "oping.h"
#ifndef _POSIX_SAVED_IDS
# define _POSIX_SAVED_IDS 0
#endif
+#ifndef IPTOS_MINCOST
+# define IPTOS_MINCOST 0x02
+#endif
+
/* Remove GNU specific __attribute__ settings when using another compiler */
#if !__GNUC__
# define __attribute__(x) /**/
double latency_total;
double latency_total_square;
+/* 1000 + one "infinity" bucket. */
+#define OPING_HISTOGRAM_BUCKETS 1001
+ uint32_t *latency_histogram;
+ size_t latency_histogram_size;
+
#if USE_NCURSES
WINDOW *window;
#endif
static int opt_count = -1;
static int opt_send_ttl = 64;
static uint8_t opt_send_qos = 0;
+#define OPING_DEFAULT_PERCENTILE 95.0
+static double opt_percentile = -1.0;
+static double opt_exit_status_threshold = 1.0;
+#if USE_NCURSES
+static int opt_show_graph = 1;
+static int opt_utf8 = 0;
+#endif
static int host_num = 0;
ret->latency_total = 0.0;
ret->latency_total_square = 0.0;
+ ret->latency_histogram_size = (size_t) OPING_HISTOGRAM_BUCKETS;
+ ret->latency_histogram = calloc (ret->latency_histogram_size,
+ sizeof (*ret->latency_histogram));
+
#if USE_NCURSES
ret->window = NULL;
#endif
}
#endif
+ free (context->latency_histogram);
+ context->latency_histogram = NULL;
+
free (context);
} /* }}} void context_destroy */
return (ctx->latency_total / num_total);
} /* }}} double context_get_average */
+static double context_get_percentile (ping_context_t *ctx, /* {{{ */
+ double percentile)
+{
+ double threshold = percentile / 100.0;
+ uint32_t accumulated[ctx->latency_histogram_size];
+ double ratios[ctx->latency_histogram_size];
+ double index_to_ms_factor;
+ uint32_t num;
+ size_t i;
+
+ if (ctx->latency_histogram == NULL)
+ return (NAN);
+
+ accumulated[0] = ctx->latency_histogram[0];
+ for (i = 1; i < ctx->latency_histogram_size; i++)
+ accumulated[i] = accumulated[i - 1]
+ + ctx->latency_histogram[i];
+ num = accumulated[ctx->latency_histogram_size - 1];
+
+ for (i = 0; i < ctx->latency_histogram_size; i++)
+ {
+ ratios[i] = ((double) accumulated[i]) / ((double) num);
+ if (ratios[i] >= threshold)
+ break;
+ }
+
+ if (i >= ctx->latency_histogram_size)
+ return (NAN);
+ else if (i == (ctx->latency_histogram_size - 1))
+ return (INFINITY);
+
+ index_to_ms_factor = (1000.0 * opt_interval) / (ctx->latency_histogram_size - 1);
+
+ /* Multiply with i+1, because we're interested in the _upper_ bound of
+ * each bucket. */
+ return (index_to_ms_factor * ((double) (i + 1)));
+} /* }}} double context_get_percentile */
+
static double context_get_stddev (ping_context_t *ctx) /* {{{ */
{
double num_total;
" -I srcaddr source address\n"
" -D device outgoing interface name\n"
" -f filename filename to read hosts from\n"
+#if USE_NCURSES
+ " -u / -U force / disable UTF-8 output\n"
+#endif
+ " -P percent Report the n'th percentile of latency\n"
+ " -Z percent Exit with non-zero exit status if more than this percentage of\n"
+ " probes timed out. (default: never)\n"
"\noping "PACKAGE_VERSION", http://verplant.org/liboping/\n"
"by Florian octo Forster <octo@verplant.org>\n"
while (1)
{
- optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:");
+ optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:P:"
+#if USE_NCURSES
+ "uUg:"
+#endif
+ );
if (optchar == -1)
break;
int new_count;
new_count = atoi (optarg);
if (new_count > 0)
+ {
opt_count = new_count;
+
+ if ((opt_percentile < 0.0) && (opt_count < 20))
+ opt_percentile = 100.0 * (opt_count - 1) / opt_count;
+ }
else
fprintf(stderr, "Ignoring invalid count: %s\n",
optarg);
opt_interval = new_interval;
}
break;
+
case 'I':
{
if (opt_srcaddr != NULL)
set_opt_send_qos (optarg);
break;
+ case 'P':
+ {
+ double new_percentile;
+ new_percentile = atof (optarg);
+ if (isnan (new_percentile)
+ || (new_percentile < 0.1)
+ || (new_percentile > 100.0))
+ fprintf (stderr, "Ignoring invalid percentile: %s\n",
+ optarg);
+ else
+ opt_percentile = new_percentile;
+ }
+ break;
+
+#if USE_NCURSES
+ case 'g':
+ if (strcasecmp ("none", optarg) == 0)
+ opt_show_graph = 0;
+ else if (strcasecmp ("prettyping", optarg) == 0)
+ opt_show_graph = 1;
+ else if (strcasecmp ("boxplot", optarg) == 0)
+ opt_show_graph = 2;
+ else if (strcasecmp ("histogram", optarg) == 0)
+ opt_show_graph = 3;
+ else
+ fprintf (stderr, "Unknown graph option: %s\n", optarg);
+ break;
+
+ case 'u':
+ opt_utf8 = 2;
+ break;
+ case 'U':
+ opt_utf8 = 1;
+ break;
+#endif
+
+ case 'Z':
+ {
+ char *endptr = NULL;
+ double tmp;
+
+ errno = 0;
+ tmp = strtod (optarg, &endptr);
+ if ((errno != 0) || (endptr == NULL) || (*endptr != 0) || (tmp < 0.0) || (tmp > 100.0))
+ {
+ fprintf (stderr, "Ignoring invalid -Z argument: %s\n", optarg);
+ fprintf (stderr, "The \"-Z\" option requires a numeric argument between 0 and 100.\n");
+ }
+ else
+ opt_exit_status_threshold = tmp / 100.0;
+
+ break;
+ }
+
case 'h':
usage_exit (argv[0], 0);
break;
+
default:
usage_exit (argv[0], 1);
}
}
+ if (opt_percentile <= 0.0)
+ opt_percentile = OPING_DEFAULT_PERCENTILE;
+
return (optind);
} /* }}} read_options */
} /* }}} void time_calc */
#if USE_NCURSES
+static _Bool has_utf8() /* {{{ */
+{
+# if HAVE_NCURSESW_NCURSES_H
+ if (!opt_utf8)
+ {
+ /* Automatically determine */
+ if (strcasecmp ("UTF-8", nl_langinfo (CODESET)) == 0)
+ opt_utf8 = 2;
+ else
+ opt_utf8 = 1;
+ }
+ return ((_Bool) (opt_utf8 - 1));
+# else
+ return (0);
+# endif
+} /* }}} _Bool has_utf8 */
+
+static int update_graph_boxplot (ping_context_t *ctx) /* {{{ */
+{
+ uint32_t *accumulated;
+ double *ratios;
+ uint32_t num;
+ size_t i;
+ size_t x_max;
+ size_t x;
+
+ x_max = (size_t) getmaxx (ctx->window);
+ if (x_max <= 4)
+ return (EINVAL);
+ x_max -= 4;
+
+ accumulated = calloc (x_max, sizeof (*accumulated));
+ ratios = calloc (x_max, sizeof (*ratios));
+
+ /* Downsample */
+ for (i = 0; i < ctx->latency_histogram_size; i++)
+ {
+ x = i * x_max / ctx->latency_histogram_size;
+ accumulated[x] += ctx->latency_histogram[i];
+ }
+
+ /* Sum */
+ for (x = 1; x < x_max; x++)
+ accumulated[x] += accumulated[x - 1];
+
+ num = accumulated[x_max - 1];
+
+ /* Calculate ratios */
+ for (x = 0; x < x_max; x++)
+ ratios[x] = ((double) accumulated[x]) / ((double) num);
+
+ for (x = 0; x < x_max; x++)
+ {
+ int symbol = ' ';
+ _Bool reverse = 0;
+
+ if (x == 0)
+ {
+ if (ratios[x] >= 0.5)
+ {
+ symbol = BOXPLOT_MEDIAN;
+ reverse = 1;
+ }
+ else if (ratios[x] > 0.25)
+ {
+ symbol = BOXPLOT_BOX;
+ reverse = 1;
+ }
+ else if (ratios[x] > 0.025)
+ symbol = BOXPLOT_WHISKER_BAR;
+ else
+ symbol = ' '; /* NOP */
+ }
+ else /* (x != 0) */
+ {
+ if ((ratios[x - 1] < 0.5) && (ratios[x] >= 0.5))
+ {
+ symbol = BOXPLOT_MEDIAN;
+ reverse = 1;
+ }
+ else if (((ratios[x] >= 0.25) && (ratios[x] <= 0.75))
+ || ((ratios[x - 1] < 0.75) && (ratios[x] > 0.75)))
+ {
+ symbol = BOXPLOT_BOX;
+ reverse = 1;
+ }
+ else if ((ratios[x] < 0.5) && (ratios[x] >= 0.025))
+ {
+ if (ratios[x - 1] < 0.025)
+ symbol = BOXPLOT_WHISKER_LEFT_END;
+ else
+ symbol = BOXPLOT_WHISKER_BAR;
+ }
+ else if ((ratios[x] > .5) && (ratios[x] < 0.975))
+ {
+ symbol = BOXPLOT_WHISKER_BAR;
+ }
+ else if ((ratios[x] >= 0.975) && (ratios[x - 1] < 0.975))
+ symbol = BOXPLOT_WHISKER_RIGHT_END;
+ }
+
+ if (reverse)
+ wattron (ctx->window, A_REVERSE);
+ mvwaddch (ctx->window, /* y = */ 3, /* x = */ (int) (x + 2), symbol);
+ // mvwprintw (ctx->window, /* y = */ 3, /* x = */ (int) (x + 2), symbol);
+ if (reverse)
+ wattroff (ctx->window, A_REVERSE);
+ }
+
+ free (ratios);
+ free (accumulated);
+ return (0);
+} /* }}} int update_graph_boxplot */
+
+static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */
+ double latency, unsigned int sequence)
+{
+ int color = OPING_RED;
+ char const *symbol = "!";
+ int symbolc = '!';
+
+ int x_max;
+ int x_pos;
+
+ x_max = getmaxx (ctx->window);
+ x_pos = ((sequence - 1) % (x_max - 4)) + 2;
+
+ if (latency >= 0.0)
+ {
+ double ratio;
+
+ size_t symbols_num = hist_symbols_acs_num;
+ size_t colors_num = 1;
+
+ size_t index_symbols;
+ size_t index_colors;
+ size_t intensity;
+
+ /* latency is in milliseconds, opt_interval is in seconds. */
+ ratio = (latency * 0.001) / opt_interval;
+ if (ratio > 1) {
+ ratio = 1.0;
+ }
+
+ if (has_utf8 ())
+ symbols_num = hist_symbols_utf8_num;
+
+ if (has_colors () == TRUE)
+ colors_num = hist_colors_num;
+
+ intensity = (size_t) (ratio * ((double) (symbols_num * colors_num)));
+ if (intensity >= (symbols_num * colors_num))
+ intensity = (symbols_num * colors_num) - 1;
+
+ index_symbols = intensity % symbols_num;
+ assert (index_symbols < symbols_num);
+
+ index_colors = intensity / symbols_num;
+ assert (index_colors < colors_num);
+
+ if (has_utf8())
+ {
+ color = hist_colors_utf8[index_colors];
+ symbol = hist_symbols_utf8[index_symbols];
+ }
+ else
+ {
+ color = hist_colors_acs[index_colors];
+ symbolc = hist_symbols_acs[index_symbols] | A_ALTCHARSET;
+ }
+ }
+ else /* if (!(latency >= 0.0)) */
+ wattron (ctx->window, A_BOLD);
+
+ if (has_colors () == TRUE)
+ wattron (ctx->window, COLOR_PAIR(color));
+
+ if (has_utf8())
+ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x_pos, symbol);
+ else
+ mvwaddch (ctx->window, /* y = */ 3, /* x = */ x_pos, symbolc);
+
+ if (has_colors () == TRUE)
+ wattroff (ctx->window, COLOR_PAIR(color));
+
+ /* Use negation here to handle NaN correctly. */
+ if (!(latency >= 0.0))
+ wattroff (ctx->window, A_BOLD);
+
+ wprintw (ctx->window, " ");
+ return (0);
+} /* }}} int update_graph_prettyping */
+
+static int update_graph_histogram (ping_context_t *ctx) /* {{{ */
+{
+ uint32_t *counters;
+ uint32_t *accumulated;
+ uint32_t num;
+ uint32_t max;
+ size_t i;
+ size_t x_max;
+ size_t x;
+
+ size_t symbols_num = hist_symbols_acs_num;
+
+ if (has_utf8 ())
+ symbols_num = hist_symbols_utf8_num;
+
+ x_max = (size_t) getmaxx (ctx->window);
+ if (x_max <= 4)
+ return (EINVAL);
+ x_max -= 4;
+
+ counters = calloc (x_max, sizeof (*counters));
+ accumulated = calloc (x_max, sizeof (*accumulated));
+
+ /* Downsample */
+ max = 0;
+ for (i = 0; i < ctx->latency_histogram_size; i++)
+ {
+ x = i * x_max / ctx->latency_histogram_size;
+ counters[x] += ctx->latency_histogram[i];
+ accumulated[x] = counters[x];
+
+ if (max < counters[x])
+ max = counters[x];
+ }
+
+ /* Sum */
+ for (x = 1; x < x_max; x++)
+ accumulated[x] += accumulated[x - 1];
+ num = accumulated[x_max - 1];
+
+ /* Calculate ratios */
+ for (x = 0; x < x_max; x++)
+ {
+ double height = ((double) counters[x]) / ((double) max);
+ double ratio_this = ((double) accumulated[x]) / ((double) num);
+ double ratio_prev = 0.0;
+ size_t index;
+ int color = 0;
+
+ index = (size_t) (height * ((double) symbols_num));
+ if (index >= symbols_num)
+ index = symbols_num - 1;
+
+ if (x > 0)
+ ratio_prev = ((double) accumulated[x - 1]) / ((double) num);
+
+ if (has_colors () == TRUE)
+ {
+ if ((ratio_this <= 0.5) || ((ratio_prev < 0.5) && (ratio_this > 0.5)))
+ color = OPING_GREEN;
+ else if ((ratio_this <= 0.95) || ((ratio_prev < 0.95) && (ratio_this > 0.95)))
+ color = OPING_YELLOW;
+ else
+ color = OPING_RED;
+
+ wattron (ctx->window, COLOR_PAIR(color));
+ }
+
+ if (counters[x] == 0)
+ mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, ' ');
+ else if (has_utf8 ())
+ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2,
+ hist_symbols_utf8[index]);
+ else
+ mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2,
+ hist_symbols_acs[index] | A_ALTCHARSET);
+
+ if (has_colors () == TRUE)
+ wattroff (ctx->window, COLOR_PAIR(color));
+
+ }
+
+ free (accumulated);
+ return (0);
+} /* }}} int update_graph_histogram */
+
static int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter) /* {{{ */
{
double latency = -1.0;
size_t buffer_len = sizeof (latency);
- int maxx;
- getmaxyx(ctx->window, maxx, maxx);
ping_iterator_get_info (iter, PING_INFO_LATENCY,
&latency, &buffer_len);
@@ -643,67 +1096,30 @@ static int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter)
{
double average;
double deviation;
+ double percentile;
average = context_get_average (ctx);
deviation = context_get_stddev (ctx);
-
+ percentile = context_get_percentile (ctx, opt_percentile);
+
mvwprintw (ctx->window, /* y = */ 2, /* x = */ 2,
- "rtt min/avg/max/sdev = %.3f/%.3f/%.3f/%.3f ms",
+ "rtt min/avg/%.0f%%/max/sdev = "
+ "%.3f/%.3f/%.0f/%.3f/%.3f ms\n",
+ opt_percentile,
ctx->latency_min,
average,
+ percentile,
ctx->latency_max,
deviation);
}
- if (latency > 0.0)
- {
- if (has_colors () == TRUE)
- {
- int color = OPING_GREEN_HIST;
- float ratio = 0;
- int index = 0;
-
- ratio = latency / PING_DEF_TTL;
- if (ratio > 1) {
- ratio = 1.0;
- }
- index = (int) ((ratio * BARS_LEN * 3) -1); /* 3 colors */
- if (index >= BARS_LEN) {
- color = OPING_YELLOW_HIST;
- }
- if (index >= 2*BARS_LEN) {
- color = OPING_RED_HIST;
- }
- /* HOST_PRINTF ("%%r%f-ia%d-", ratio, index); */
- index = index % BARS_LEN;
- /* HOST_PRINTF ("im%d-", index); */
- if (index < 0) {
- index = 0; /* safety check */
- }
- if (index >= BARS_LEN) {
- index = BARS_LEN - 1; /* safety check */
- }
- wattron (ctx->window, COLOR_PAIR(color));
- mvwprintw (ctx->window,
- /* y = */ 3,
- /* x = */ ( (sequence - 1) % (maxx - 4) ) + 2,
- bars[index]);
- wattroff (ctx->window, COLOR_PAIR(color));
- wprintw (ctx->window, " ");
- }
- else
- {
- }
- }
- else {
- wattron (ctx->window, COLOR_PAIR(OPING_RED) | A_BOLD);
- mvwprintw (ctx->window,
- /* y = */ 3,
- /* x = */ ( (sequence - 1) % (maxx - 4) ) + 2,
- "!");
- wattroff (ctx->window, COLOR_PAIR(OPING_RED) | A_BOLD);
- wprintw (ctx->window, " ");
- }
+ if (opt_show_graph == 1)
+ update_graph_prettyping (ctx, latency, sequence);
+ else if (opt_show_graph == 2)
+ update_graph_boxplot (ctx);
+ else if (opt_show_graph == 3)
+ update_graph_histogram (ctx);
+
wrefresh (ctx->window);
return (0);
int width = 0;
int height = 0;
int main_win_height;
+ int box_height = (opt_show_graph == 0) ? 4 : 5;
getmaxyx (stdscr, height, width);
if ((height < 1) || (width < 1))
return (EINVAL);
- main_win_height = height - (5 * host_num);
+ main_win_height = height - (box_height * host_num);
wresize (main_win, main_win_height, /* width = */ width);
/* Allow scrolling */
scrollok (main_win, TRUE);
delwin (context->window);
context->window = NULL;
}
- context->window = newwin (/* height = */ 5,
+ context->window = newwin (/* height = */ box_height,
/* width = */ width,
- /* y = */ main_win_height + (5 * context->index),
+ /* y = */ main_win_height + (box_height * context->index),
/* x = */ 0);
}
int width = 0;
int height = 0;
int main_win_height;
+ int box_height = (opt_show_graph == 0) ? 4 : 5;
initscr ();
cbreak ();
init_pair (OPING_RED_HIST, COLOR_RED, COLOR_YELLOW);
}
- main_win_height = height - (5 * host_num);
+ main_win_height = height - (box_height * host_num);
main_win = newwin (/* height = */ main_win_height,
/* width = */ width,
/* y = */ 0, /* x = */ 0);
delwin (context->window);
context->window = NULL;
}
- context->window = newwin (/* height = */ 5,
+ context->window = newwin (/* height = */ box_height,
/* width = */ width,
- /* y = */ main_win_height + (5 * context->index),
+ /* y = */ main_win_height + (box_height * context->index),
/* x = */ 0);
}
@@ -894,6 +1312,30 @@ static int post_sleep_hook (__attribute__((unused)) pingobj_t *ping) /* {{{ */
} /* }}} int post_sleep_hook */
#endif
+static void update_context (ping_context_t *context, double latency) /* {{{ */
+{
+ size_t bucket;
+
+ context->req_rcvd++;
+ context->latency_total += latency;
+ context->latency_total_square += (latency * latency);
+
+ if ((context->latency_max < 0.0) || (context->latency_max < latency))
+ context->latency_max = latency;
+ if ((context->latency_min < 0.0) || (context->latency_min > latency))
+ context->latency_min = latency;
+
+ if (context->latency_histogram == NULL)
+ return;
+
+ /* latency is in ms, opt_interval is in s. */
+ bucket = (size_t) ((latency * (context->latency_histogram_size - 1))
+ / (1000.0 * opt_interval));
+ if (bucket >= context->latency_histogram_size)
+ bucket = context->latency_histogram_size - 1;
+ context->latency_histogram[bucket]++;
+} /* }}} void update_context */
+
static void update_host_hook (pingobj_iter_t *iter, /* {{{ */
__attribute__((unused)) int index)
{
context->req_sent++;
if (latency > 0.0)
{
- context->req_rcvd++;
- context->latency_total += latency;
- context->latency_total_square += (latency * latency);
-
- if ((context->latency_max < 0.0) || (context->latency_max < latency))
- context->latency_max = latency;
- if ((context->latency_min < 0.0) || (context->latency_min > latency))
- context->latency_min = latency;
+ update_context (context, latency);
#if USE_NCURSES
if (has_colors () == TRUE)
#endif
} /* }}} void update_host_hook */
+/* Prints statistics for each host, cleans up the contexts and returns the
+ * number of hosts which failed to return more than the fraction
+ * opt_exit_status_threshold of pings. */
static int post_loop_hook (pingobj_t *ping) /* {{{ */
{
pingobj_iter_t *iter;
+ int failure_count = 0;
#if USE_NCURSES
endwin ();
context_get_packet_loss (context),
context->latency_total);
+ {
+ double pct_failed = 1.0 - (((double) context->req_rcvd)
+ / ((double) context->req_sent));
+ if (pct_failed > opt_exit_status_threshold)
+ failure_count++;
+ }
+
if (context->req_rcvd != 0)
{
double average;
double deviation;
+ double percentile;
average = context_get_average (context);
deviation = context_get_stddev (context);
+ percentile = context_get_percentile (context, opt_percentile);
- printf ("rtt min/avg/max/sdev = %.3f/%.3f/%.3f/%.3f ms\n",
+ printf ("rtt min/avg/%.0f%%/max/sdev = "
+ "%.3f/%.3f/%.0f/%.3f/%.3f ms\n",
+ opt_percentile,
context->latency_min,
average,
+ percentile,
context->latency_max,
deviation);
}
context_destroy (context);
}
- return (0);
+ return (failure_count);
} /* }}} int post_loop_hook */
int main (int argc, char **argv) /* {{{ */
return (1);
}
- if (ping_send (ping) < 0)
+ status = ping_send (ping);
+ if (status == -EINTR)
+ {
+ continue;
+ }
+ else if (status < 0)
{
fprintf (stderr, "ping_send failed: %s\n",
ping_get_error (ping));
/* printf ("Sleeping for %i.%09li seconds\n", (int) ts_wait.tv_sec, ts_wait.tv_nsec); */
while ((status = nanosleep (&ts_wait, &ts_wait)) != 0)
{
- if (errno != EINTR)
+ if (errno == EINTR)
{
- perror ("nanosleep");
- break;
+ continue;
}
- else if (opt_count == 0)
+ else
{
- /* sigint */
+ perror ("nanosleep");
break;
}
}
opt_count--;
} /* while (opt_count != 0) */
- post_loop_hook (ping);
+ /* Returns the number of failed hosts according to -Z. */
+ status = post_loop_hook (ping);
ping_destroy (ping);
- return (0);
+ if (status == 0)
+ exit (EXIT_SUCCESS);
+ else
+ {
+ if (status > 255)
+ status = 255;
+ exit (status);
+ }
} /* }}} int main */
/* vim: set fdm=marker : */