![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/oping.c b/src/oping.c
index 367227ae17e1cc6dfb95b9741626245a29922840..d0e9f3344134dd0b01d0ea0ecef1cdb5e5e02ed8 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
/**
* Object oriented C module to send ICMP and ICMPv6 `echo's.
- * Copyright (C) 2006-2014 Florian octo Forster <ff at octo.it>
+ * Copyright (C) 2006-2016 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
# define OPING_YELLOW_HIST 5
# define OPING_RED_HIST 6
+double const threshold_green = 0.8;
+double const threshold_yellow = 0.95;
+
static char const * const hist_symbols_utf8[] = {
"▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" };
static size_t const hist_symbols_utf8_num = sizeof (hist_symbols_utf8)
int req_sent;
int req_rcvd;
- double latency_min;
- double latency_max;
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;
+#ifndef HISTORY_SIZE_MAX
+# define HISTORY_SIZE_MAX 900
+#endif
+ /* The last n RTTs in the order they were sent. */
+ double history_by_time[HISTORY_SIZE_MAX];
+
+ /* Current number of entries in the history. This is a value between 0
+ * and HISTORY_SIZE_MAX. */
+ size_t history_size;
+
+ /* Number "received" entries in the history, i.e. non-NAN entries. */
+ size_t history_received;
+
+ /* Index of the next RTT to be written to history_by_time. This wraps
+ * around to 0 once the histroty has grown to HISTORY_SIZE_MAX. */
+ size_t history_index;
+
+ /* The last history_size RTTs sorted by value. timed out packets (NAN
+ * entries) are sorted to the back. */
+ double history_by_value[HISTORY_SIZE_MAX];
+
+ /* If set to true, history_by_value has to be re-calculated. */
+ _Bool history_dirty;
#if USE_NCURSES
WINDOW *window;
} ping_context_t;
static double opt_interval = 1.0;
+static double opt_timeout = PING_DEF_TIMEOUT;
static int opt_addrfamily = PING_DEF_AF;
static char *opt_srcaddr = NULL;
static char *opt_device = NULL;
+static char *opt_mark = NULL;
static char *opt_filename = NULL;
static int opt_count = -1;
static int opt_send_ttl = 64;
static int opt_show_graph = 1;
static int opt_utf8 = 0;
#endif
+static char *opt_outfile = NULL;
+static int opt_bell = 0;
-static int host_num = 0;
+static int host_num = 0;
+static FILE *outfile = NULL;
#if USE_NCURSES
static WINDOW *main_win = NULL;
memset (ret, '\0', sizeof (ping_context_t));
- ret->latency_min = -1.0;
- ret->latency_max = -1.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
- free (context->latency_histogram);
- context->latency_histogram = NULL;
-
free (context);
} /* }}} void context_destroy */
-static double context_get_average (ping_context_t *ctx) /* {{{ */
+static int compare_double (void const *arg0, void const *arg1) /* {{{ */
{
- double num_total;
+ double dbl0 = *((double *) arg0);
+ double dbl1 = *((double *) arg1);
- if (ctx == NULL)
- return (-1.0);
+ if (isnan (dbl0))
+ {
+ if (isnan (dbl1))
+ return 0;
+ else
+ return 1;
+ }
+ else if (isnan (dbl1))
+ return -1;
+ else if (dbl0 < dbl1)
+ return -1;
+ else if (dbl0 > dbl1)
+ return 1;
+ else
+ return 0;
+} /* }}} int compare_double */
+
+static void clean_history (ping_context_t *ctx) /* {{{ */
+{
+ size_t i;
+
+ if (!ctx->history_dirty)
+ return;
+
+ /* Copy all values from by_time to by_value. */
+ memcpy (ctx->history_by_value, ctx->history_by_time,
+ sizeof (ctx->history_by_time));
+
+ /* Remove impossible values caused by adding a new host */
+ for (i = 0; i < ctx->history_size; i++)
+ if (ctx->history_by_value[i]<0)
+ ctx->history_by_value[i]=NAN;
- if (ctx->req_rcvd < 1)
- return (-0.0);
+ /* Sort all RTTs. */
+ qsort (ctx->history_by_value, ctx->history_size, sizeof
+ (ctx->history_by_value[0]), compare_double);
- num_total = (double) ctx->req_rcvd;
- return (ctx->latency_total / num_total);
-} /* }}} double context_get_average */
+ /* Update the number of received RTTs. */
+ ctx->history_received = 0;
+ for (i = 0; i < ctx->history_size; i++)
+ if (!isnan (ctx->history_by_value[i]))
+ ctx->history_received++;
-static double context_get_percentile (ping_context_t *ctx, /* {{{ */
+ /* Mark as clean. */
+ ctx->history_dirty = 0;
+} /* }}} void clean_history */
+
+static double percentile_to_latency (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;
+ size_t index;
- if (ctx->latency_histogram == NULL)
- return (NAN);
+ clean_history (ctx);
- 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];
+ /* Not a single packet was received successfully. */
+ if (ctx->history_received == 0)
+ return NAN;
- for (i = 0; i < ctx->latency_histogram_size; i++)
+ if (percentile <= 0.0)
+ index = 0;
+ else if (percentile >= 100.0)
+ index = ctx->history_received - 1;
+ else
{
- ratios[i] = ((double) accumulated[i]) / ((double) num);
- if (ratios[i] >= threshold)
- break;
+ index = (size_t) ceil ((percentile / 100.0) * ((double) ctx->history_received));
+ assert (index > 0);
+ index--;
}
- 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 */
+ return (ctx->history_by_value[index]);
+} /* }}} double percentile_to_latency */
-static double context_get_stddev (ping_context_t *ctx) /* {{{ */
+#if USE_NCURSES
+static double latency_to_ratio (ping_context_t *ctx, /* {{{ */
+ double latency)
{
- double num_total;
+ size_t low;
+ size_t high;
+ size_t index;
+
+ clean_history (ctx);
+
+ /* Not a single packet was received successfully. */
+ if (ctx->history_received == 0)
+ return NAN;
+
+ low = 0;
+ high = ctx->history_received - 1;
+
+ if (latency < ctx->history_by_value[low])
+ return 0.0;
+ else if (latency >= ctx->history_by_value[high])
+ return 100.0;
+
+ /* Do a binary search for the latency. This will work even when the
+ * exact latency is not in the array. If the latency is in the array
+ * multiple times, "low" will be set to the index of the last
+ * occurrence. The value at index "high" will be larger than the
+ * searched for latency (assured by the above "if" block. */
+ while ((high - low) > 1)
+ {
+ index = (high + low) / 2;
- if (ctx == NULL)
- return (-1.0);
+ if (ctx->history_by_value[index] > latency)
+ high = index;
+ else
+ low = index;
+ }
- if (ctx->req_rcvd < 1)
- return (-0.0);
- else if (ctx->req_rcvd < 2)
- return (0.0);
+ assert (ctx->history_by_value[high] > latency);
+ assert (ctx->history_by_value[low] <= latency);
- num_total = (double) ctx->req_rcvd;
- return (sqrt (((num_total * ctx->latency_total_square)
- - (ctx->latency_total * ctx->latency_total))
- / (num_total * (num_total - 1.0))));
-} /* }}} double context_get_stddev */
+ if (ctx->history_by_value[low] == latency)
+ index = low;
+ else
+ index = high;
+
+ return (((double) (index + 1)) / ((double) ctx->history_received));
+} /* }}} double latency_to_ratio */
+#endif
static double context_get_packet_loss (const ping_context_t *ctx) /* {{{ */
{
{
pingobj_iter_t *iter;
int index;
+ size_t history_size = 0;
if (ping == NULL)
return (EINVAL);
ping_context_t *context;
size_t buffer_size;
+ context = ping_iterator_get_context(iter);
+
+ /* if this is a previously existing host, do not recreate it */
+ if (context != NULL) {
+ history_size = context->history_size;
+ context->index = index++;
+ continue;
+ }
+
context = context_create ();
context->index = index;
+ /* start new hosts at the same graph point as old hosts */
+ context->history_size = history_size;
+ context->history_index = history_size;
+ for (int i = 0; i<history_size; i++) {
+ context->history_by_time[i] = -1;
+ }
+
buffer_size = sizeof (context->host);
ping_iterator_get_info (iter, PING_INFO_HOSTNAME, context->host, &buffer_size);
" -4|-6 force the use of IPv4 or IPv6\n"
" -c count number of ICMP packets to send\n"
" -i interval interval with which to send ICMP packets\n"
+ " -w timeout time to wait for replies, in seconds\n"
" -t ttl time to live for each ICMP packet\n"
" -Q qos Quality of Service (QoS) of outgoing packets\n"
" Use \"-Q help\" for a list of valid options.\n"
" -I srcaddr source address\n"
" -D device outgoing interface name\n"
- " -f filename filename to read hosts from\n"
+ " -m mark mark to set on outgoing packets\n"
+ " -f filename read hosts from <filename>\n"
+ " -O filename write RTT measurements to <filename>\n"
#if USE_NCURSES
" -u / -U force / disable UTF-8 output\n"
" -g graph graph type to draw\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"
+ "\noping "PACKAGE_VERSION", http://noping.cc/\n"
+ "by Florian octo Forster <ff@octo.it>\n"
"for contributions see `AUTHORS'\n",
name);
exit (status);
while (1)
{
- optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:P:"
+ optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:O:P:m:w:b"
#if USE_NCURSES
"uUg:"
#endif
}
break;
+ case 'w':
+ {
+ char *endp = NULL;
+ double t = strtod (optarg, &endp);
+ if ((optarg[0] != 0) && (endp != NULL) && (*endp == 0))
+ opt_timeout = t;
+ else
+ fprintf (stderr, "Ignoring invalid timeout: %s\n",
+ optarg);
+ }
+ break;
+
case 'I':
{
if (opt_srcaddr != NULL)
opt_device = optarg;
break;
+ case 'm':
+ opt_mark = optarg;
+ break;
+
case 't':
{
int new_send_ttl;
set_opt_send_qos (optarg);
break;
+ case 'O':
+ {
+ free (opt_outfile);
+ opt_outfile = strdup (optarg);
+ }
+ break;
+
case 'P':
{
double new_percentile;
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 = 2;
+ else if (strcasecmp ("boxplot", optarg) == 0)
opt_show_graph = 3;
else
fprintf (stderr, "Unknown graph option: %s\n", optarg);
opt_utf8 = 1;
break;
#endif
+ case 'b':
+ opt_bell = 1;
+ break;
case 'Z':
{
static int update_graph_boxplot (ping_context_t *ctx) /* {{{ */
{
- uint32_t *accumulated;
+ uint32_t *counters;
double *ratios;
- uint32_t num;
size_t i;
size_t x_max;
size_t x;
+ clean_history (ctx);
+
+ if (ctx->history_received == 0)
+ return (ENOENT);
+
x_max = (size_t) getmaxx (ctx->window);
- if (x_max <= 4)
+ if (x_max <= 8)
return (EINVAL);
x_max -= 4;
- accumulated = calloc (x_max, sizeof (*accumulated));
+ counters = calloc (x_max, sizeof (*counters));
ratios = calloc (x_max, sizeof (*ratios));
- /* Downsample */
- for (i = 0; i < ctx->latency_histogram_size; i++)
+ /* Bucketize */
+ for (i = 0; i < ctx->history_received; i++)
{
- x = i * x_max / ctx->latency_histogram_size;
- accumulated[x] += ctx->latency_histogram[i];
- }
+ double latency = ctx->history_by_value[i] / 1000.0;
+ size_t index = (size_t) (((double) x_max) * latency / opt_interval);
- /* Sum */
- for (x = 1; x < x_max; x++)
- accumulated[x] += accumulated[x - 1];
+ if (index >= x_max)
+ index = x_max - 1;
- num = accumulated[x_max - 1];
+ counters[index]++;
+ }
- /* Calculate ratios */
- for (x = 0; x < x_max; x++)
- ratios[x] = ((double) accumulated[x]) / ((double) num);
+ /* Sum and calc ratios */
+ ratios[0] = ((double) counters[0]) / ((double) ctx->history_received);
+ for (x = 1; x < x_max; x++)
+ {
+ counters[x] += counters[x - 1];
+ ratios[x] = ((double) counters[x]) / ((double) ctx->history_received);
+ }
for (x = 0; x < x_max; x++)
{
wattroff (ctx->window, A_REVERSE);
}
+ free (counters);
free (ratios);
- free (accumulated);
return (0);
} /* }}} int update_graph_boxplot */
static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */
- double latency, unsigned int sequence)
+ double latency)
{
- int color = OPING_RED;
- char const *symbol = "!";
- int symbolc = '!';
-
- int x_max;
- int x_pos;
+ size_t x;
+ size_t x_max;
+ size_t history_offset;
- x_max = getmaxx (ctx->window);
- x_pos = ((sequence - 1) % (x_max - 4)) + 2;
+ x_max = (size_t) getmaxx (ctx->window);
+ if (x_max <= 4)
+ return (EINVAL);
+ x_max -= 4;
- if (latency >= 0.0)
+ /* Determine the first index in the history we need to draw
+ * the graph. */
+ history_offset = 0;
+ if (((size_t) x_max) < ctx->history_size) /* window is smaller than history */
+ {
+ if (ctx->history_index > x_max)
+ history_offset = ctx->history_index - x_max;
+ else /* wrap around */
+ history_offset = ctx->history_index + ctx->history_size - x_max;
+ }
+ else /* window is larger than history */
{
- double ratio;
+ if (ctx->history_index != ctx->history_size) /* no longer growing. */
+ history_offset = ctx->history_index;
+ else /* start-up */
+ history_offset = 0;
+ }
- size_t symbols_num = hist_symbols_acs_num;
- size_t colors_num = 1;
+ for (x = 0; x < x_max; x++)
+ {
+ size_t index;
+ double latency;
- size_t index_symbols;
- size_t index_colors;
- size_t intensity;
+ int color = OPING_RED;
+ char const *symbol = "!";
+ int symbolc = '!';
- /* latency is in milliseconds, opt_interval is in seconds. */
- ratio = (latency * 0.001) / opt_interval;
- if (ratio > 1) {
- ratio = 1.0;
+ if (x >= ctx->history_size)
+ {
+ mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, ' ');
+ continue;
}
- if (has_utf8 ())
- symbols_num = hist_symbols_utf8_num;
+ index = (history_offset + x) % ctx->history_size;
+ latency = ctx->history_by_time[index];
- if (has_colors () == TRUE)
- colors_num = hist_colors_num;
+ if (latency < 0) {
+ continue;
+ }
- intensity = (size_t) (ratio * ((double) (symbols_num * colors_num)));
- if (intensity >= (symbols_num * colors_num))
- intensity = (symbols_num * colors_num) - 1;
+ if (latency >= 0.0)
+ {
+ double ratio;
- index_symbols = intensity % symbols_num;
- assert (index_symbols < symbols_num);
+ size_t symbols_num = hist_symbols_acs_num;
+ size_t colors_num = 1;
- index_colors = intensity / symbols_num;
- assert (index_colors < colors_num);
+ size_t index_symbols;
+ size_t index_colors;
+ size_t intensity;
- 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;
+ /* 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);
+ else /* if (!(latency >= 0.0)) */
+ wattron (ctx->window, A_BOLD);
- if (has_colors () == TRUE)
- wattron (ctx->window, COLOR_PAIR(color));
+ 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_utf8())
+ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, symbol);
+ else
+ mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, symbolc);
- if (has_colors () == TRUE)
- wattroff (ctx->window, COLOR_PAIR(color));
+ 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);
+ /* Use negation here to handle NaN correctly. */
+ if (!(latency >= 0.0))
+ wattroff (ctx->window, A_BOLD);
+ } /* for (x) */
- wprintw (ctx->window, " ");
return (0);
} /* }}} int update_graph_prettyping */
{
uint32_t *counters;
uint32_t *accumulated;
- uint32_t num;
uint32_t max;
size_t i;
size_t x_max;
size_t symbols_num = hist_symbols_acs_num;
+ clean_history (ctx);
+
+ if (ctx->history_received == 0)
+ return (ENOENT);
+
if (has_utf8 ())
symbols_num = hist_symbols_utf8_num;
counters = calloc (x_max, sizeof (*counters));
accumulated = calloc (x_max, sizeof (*accumulated));
- /* Downsample */
+ /* Bucketize */
max = 0;
- for (i = 0; i < ctx->latency_histogram_size; i++)
+ for (i = 0; i < ctx->history_received; i++)
{
- x = i * x_max / ctx->latency_histogram_size;
- counters[x] += ctx->latency_histogram[i];
- accumulated[x] = counters[x];
+ double latency = ctx->history_by_value[i] / 1000.0;
+ size_t index = (size_t) (((double) x_max) * latency / opt_interval);
+
+ if (index >= x_max)
+ index = x_max - 1;
- if (max < counters[x])
- max = counters[x];
+ counters[index]++;
+ if (max < counters[index])
+ max = counters[index];
}
/* Sum */
+ accumulated[0] = counters[0];
for (x = 1; x < x_max; x++)
- accumulated[x] += accumulated[x - 1];
- num = accumulated[x_max - 1];
+ accumulated[x] = counters[x] + accumulated[x - 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_this = ((double) accumulated[x]) / ((double) ctx->history_received);
double ratio_prev = 0.0;
size_t index;
int color = 0;
index = symbols_num - 1;
if (x > 0)
- ratio_prev = ((double) accumulated[x - 1]) / ((double) num);
+ ratio_prev = ((double) accumulated[x - 1]) / ((double) ctx->history_received);
if (has_colors () == TRUE)
{
- if ((ratio_this <= 0.5) || ((ratio_prev < 0.5) && (ratio_this > 0.5)))
+ if ((ratio_this <= threshold_green)
+ || ((ratio_prev < threshold_green)
+ && (ratio_this > threshold_green)))
color = OPING_GREEN;
- else if ((ratio_this <= 0.95) || ((ratio_prev < 0.95) && (ratio_this > 0.95)))
+ else if ((ratio_this <= threshold_yellow)
+ || ((ratio_prev < threshold_yellow)
+ && (ratio_this > threshold_yellow)))
color = OPING_YELLOW;
else
color = OPING_RED;
@@ -1070,12 +1243,6 @@ static int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter)
ping_iterator_get_info (iter, PING_INFO_LATENCY,
&latency, &buffer_len);
- unsigned int sequence = 0;
- buffer_len = sizeof (sequence);
- ping_iterator_get_info (iter, PING_INFO_SEQUENCE,
- &sequence, &buffer_len);
-
-
if ((ctx == NULL) || (ctx->window == NULL))
return (EINVAL);
@@ -1095,31 +1262,27 @@ static int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter)
ctx->latency_total);
if (ctx->req_rcvd != 0)
{
- double average;
- double deviation;
+ double min;
+ double median;
+ double max;
double percentile;
- average = context_get_average (ctx);
- deviation = context_get_stddev (ctx);
- percentile = context_get_percentile (ctx, opt_percentile);
+ min = percentile_to_latency (ctx, 0.0);
+ median = percentile_to_latency (ctx, 50.0);
+ max = percentile_to_latency (ctx, 100.0);
+ percentile = percentile_to_latency (ctx, opt_percentile);
mvwprintw (ctx->window, /* y = */ 2, /* x = */ 2,
- "rtt min/avg/%.0f%%/max/sdev = "
- "%.3f/%.3f/%.0f/%.3f/%.3f ms\n",
- opt_percentile,
- ctx->latency_min,
- average,
- percentile,
- ctx->latency_max,
- deviation);
+ "RTT[ms]: min = %.0f, median = %.0f, p(%.0f) = %.0f, max = %.0f ",
+ min, median, opt_percentile, percentile, max);
}
if (opt_show_graph == 1)
- update_graph_prettyping (ctx, latency, sequence);
+ update_graph_prettyping (ctx, latency);
else if (opt_show_graph == 2)
- update_graph_boxplot (ctx);
- else if (opt_show_graph == 3)
update_graph_histogram (ctx);
+ else if (opt_show_graph == 3)
+ update_graph_boxplot (ctx);
wrefresh (ctx->window);
break;
else if (key == KEY_RESIZE)
need_resize = 1;
+ else if (key == 'g')
+ {
+ if (opt_show_graph == 3)
+ opt_show_graph = 1;
+ else if (opt_show_graph > 0)
+ opt_show_graph++;
+ }
+ else if (key == 'a')
+ {
+ char host[80];
+
+ wprintw(main_win, "New Host: ");
+ echo();
+ wgetnstr(main_win, host, sizeof(host));
+ noecho();
+
+ if (ping_host_add(ping, host) < 0)
+ {
+ const char *errmsg = ping_get_error (ping);
+
+ wprintw (main_win, "Adding host `%s' failed: %s\n", host, errmsg);
+ }
+ else
+ {
+ int box_height = (opt_show_graph == 0) ? 4 : 5;
+
+ /* make sure old data is still visible */
+ for (int i = 0; i<box_height; i++)
+ wprintw (main_win, "\n");
+
+ need_resize = 1;
+ host_num++;
+ ping_initialize_contexts(ping);
+ }
+ }
}
if (need_resize)
@@ -1313,28 +1511,28 @@ 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) /* {{{ */
+static void update_context (ping_context_t *ctx, double latency) /* {{{ */
{
- size_t bucket;
+ ctx->req_sent++;
- context->req_rcvd++;
- context->latency_total += latency;
- context->latency_total_square += (latency * latency);
+ if (latency > 0.0)
+ {
+ ctx->req_rcvd++;
+ ctx->latency_total += latency;
+ }
+ else
+ {
+ latency = NAN;
+ }
- 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;
+ ctx->history_by_time[ctx->history_index] = latency;
- if (context->latency_histogram == NULL)
- return;
+ ctx->history_dirty = 1;
- /* 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]++;
+ /* Update index and size. */
+ ctx->history_index = (ctx->history_index + 1) % HISTORY_SIZE_MAX;
+ if (ctx->history_size < HISTORY_SIZE_MAX)
+ ctx->history_size++;
} /* }}} void update_context */
static void update_host_hook (pingobj_iter_t *iter, /* {{{ */
# define HOST_PRINTF(...) printf(__VA_ARGS__)
#endif
- context->req_sent++;
+ update_context (context, latency);
+
if (latency > 0.0)
{
- update_context (context, latency);
-
#if USE_NCURSES
if (has_colors () == TRUE)
{
+ double ratio;
int color = OPING_GREEN;
- double average = context_get_average (context);
- double stddev = context_get_stddev (context);
- if ((latency < (average - (2 * stddev)))
- || (latency > (average + (2 * stddev))))
- color = OPING_RED;
- else if ((latency < (average - stddev))
- || (latency > (average + stddev)))
+ ratio = latency_to_ratio (context, latency);
+ if (ratio < threshold_green)
+ color = OPING_GREEN;
+ else if (ratio < threshold_yellow)
color = OPING_YELLOW;
+ else
+ color = OPING_RED;
HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i ",
data_len, context->host, context->addr,
#if USE_NCURSES
}
#endif
+ if (opt_bell) {
+#if USE_NCURSES
+ beep();
+#else
+ HOST_PRINTF ("\a");
+#endif
+ }
}
- else
+ else /* if (!(latency > 0.0)) */
{
#if USE_NCURSES
if (has_colors () == TRUE)
#endif
}
+ if (outfile != NULL)
+ {
+ struct timespec ts = { 0, 0 };
+
+ if (clock_gettime (CLOCK_REALTIME, &ts) == 0)
+ {
+ double t = ((double) ts.tv_sec) + (((double) ts.tv_nsec) / 1000000000.0);
+
+ if ((sequence % 32) == 0)
+ fprintf (outfile, "#time,host,latency[ms]\n");
+
+ fprintf (outfile, "%.3f,\"%s\",%.2f\n", t, context->host, latency);
+ }
+ }
+
#if USE_NCURSES
update_stats_from_context (context, iter);
wrefresh (main_win);
if (context->req_rcvd != 0)
{
- double average;
- double deviation;
+ double min;
+ double median;
+ double max;
double percentile;
- average = context_get_average (context);
- deviation = context_get_stddev (context);
- percentile = context_get_percentile (context, opt_percentile);
-
- 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);
+ min = percentile_to_latency (context, 0.0);
+ median = percentile_to_latency (context, 50.0);
+ max = percentile_to_latency (context, 100.0);
+ percentile = percentile_to_latency (context, opt_percentile);
+
+ printf ("RTT[ms]: min = %.0f, median = %.0f, p(%.0f) = %.0f, max = %.0f\n",
+ min, median, opt_percentile, percentile, max);
}
ping_iterator_set_context (iter, NULL);
}
#endif
- setlocale(LC_ALL, "");
+ setlocale(LC_ALL, "");
optind = read_options (argc, argv);
#if !_POSIX_SAVED_IDS
/* printf ("ts_int = %i.%09li\n", (int) ts_int.tv_sec, ts_int.tv_nsec); */
}
+ if (ping_setopt (ping, PING_OPT_TIMEOUT, (void*)(&opt_timeout)) != 0)
+ {
+ fprintf (stderr, "Setting timeout failed: %s\n",
+ ping_get_error (ping));
+ }
+
if (opt_addrfamily != PING_DEF_AF)
ping_setopt (ping, PING_OPT_AF, (void *) &opt_addrfamily);
}
}
+ if (opt_mark != NULL)
+ {
+ char *endp = NULL;
+ int mark = (int) strtol (opt_mark, &endp, /* base = */ 0);
+ if ((opt_mark[0] != 0) && (endp != NULL) && (*endp == 0))
+ {
+ if (ping_setopt(ping, PING_OPT_MARK, (void*)(&mark)) != 0)
+ {
+ fprintf (stderr, "Setting mark failed: %s\n",
+ ping_get_error (ping));
+ }
+ }
+ else
+ {
+ fprintf(stderr, "Ignoring invalid mark: %s\n", optarg);
+ }
+ }
+
if (opt_filename != NULL)
{
FILE *infile;
exit (EXIT_FAILURE);
}
+ if (host_num == 0)
+ exit (EXIT_FAILURE);
+
#if _POSIX_SAVED_IDS
saved_set_uid = (uid_t) -1;
#endif
+ if (opt_outfile != NULL)
+ {
+ outfile = fopen (opt_outfile, "a");
+ if (outfile == NULL)
+ {
+ fprintf (stderr, "opening \"%s\" failed: %s\n",
+ opt_outfile, strerror (errno));
+ exit (EXIT_FAILURE);
+ }
+ }
+
ping_initialize_contexts (ping);
if (i == 0)
ping_destroy (ping);
+ if (outfile != NULL)
+ {
+ fclose (outfile);
+ outfile = NULL;
+ }
+
if (status == 0)
exit (EXIT_SUCCESS);
else