# define OPING_GREEN 1
# define OPING_YELLOW 2
# define OPING_RED 3
+# define OPING_GREEN_HIST 4
+# define OPING_YELLOW_HIST 5
+# define OPING_RED_HIST 6
+
+static char const * const hist_symbols[] = {
+ "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" };
+static size_t const hist_symbols_num = sizeof (hist_symbols)
+ / sizeof (hist_symbols[0]);
+
+static int const hist_colors[] = {
+ OPING_GREEN_HIST, OPING_YELLOW_HIST, OPING_RED_HIST };
+static size_t const hist_colors_num = sizeof (hist_colors)
+ / sizeof (hist_colors[0]);
#endif
#include "oping.h"
-const char *bars[BARS_LEN] = { "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" };
-
#ifndef _POSIX_SAVED_IDS
# define _POSIX_SAVED_IDS 0
#endif
} /* }}} void time_calc */
#if USE_NCURSES
+static int update_prettyping_graph (ping_context_t *ctx, /* {{{ */
+ double latency, unsigned int sequence)
+{
+ int color = OPING_RED;
+ char const *symbol = "!";
+
+ 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 intensity;
+ size_t index_colors;
+ size_t index_symbols;
+
+ ratio = latency / PING_DEF_TTL;
+ if (ratio > 1) {
+ ratio = 1.0;
+ }
+
+ intensity = (size_t) ((ratio * hist_symbols_num
+ * hist_colors_num) - 1);
+
+ index_colors = intensity / hist_symbols_num;
+ assert (index_colors < hist_colors_num);
+ color = hist_colors[index_colors];
+
+ index_symbols = intensity % hist_symbols_num;
+ symbol = hist_symbols[index_symbols];
+ }
+ else /* if (!(latency >= 0.0)) */
+ wattron (ctx->window, A_BOLD);
+
+ wattron (ctx->window, COLOR_PAIR(color));
+ mvwprintw (ctx->window,
+ /* y = */ 3,
+ /* x = */ x_pos,
+ symbol);
+ 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_prettyping_graph */
+
static int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter) /* {{{ */
{
double latency = -1.0;
size_t buffer_len = sizeof (latency);
+
ping_iterator_get_info (iter, PING_INFO_LATENCY,
&latency, &buffer_len);
deviation = context_get_stddev (ctx);
mvwprintw (ctx->window, /* y = */ 2, /* x = */ 2,
- "rtt min/avg/max/sdev = %.3f/%.3f/%.3f/%.3f ms\n",
+ "rtt min/avg/max/sdev = %.3f/%.3f/%.3f/%.3f ms",
ctx->latency_min,
average,
ctx->latency_max,
deviation);
}
- if (latency > 0.0)
- {
- if (has_colors () == TRUE)
- {
- int color = OPING_GREEN;
- float ratio = 0;
- int index = 0;
-
- ratio = latency / PING_DEF_TTL;
- if (ratio > 2/3.0) {
- color = OPING_RED;
- }
- else if (ratio > 1/3.0) {
- color = OPING_YELLOW;
- }
- index = (int) (ratio * BARS_LEN * 3); /* 3 colors */
- /* HOST_PRINTF ("%%r%f-ia%d-", ratio, index); */
- index = index % (BARS_LEN-1);
- /* HOST_PRINTF ("im%d-", index); */
- if (index < 0 || index >= BARS_LEN) {
- index = 0; /* safety check */
- }
- wattron (ctx->window, COLOR_PAIR(color));
- mvwprintw (ctx->window,
- /* y = */ 3, /* x = */ 1 + sequence,
- bars[index]);
- wattroff (ctx->window, COLOR_PAIR(color));
- }
- else
- {
- }
- }
- else {
- wattron (ctx->window, COLOR_PAIR(OPING_RED) | A_BOLD);
- mvwprintw (ctx->window,
- /* y = */ 3, /* x = */ 1 + sequence,
- "!");
- wattroff (ctx->window, COLOR_PAIR(OPING_RED) | A_BOLD);
- }
+ if (has_colors () == TRUE)
+ update_prettyping_graph (ctx, latency, sequence);
+
wrefresh (ctx->window);
return (0);
init_pair (OPING_GREEN, COLOR_GREEN, /* default = */ 0);
init_pair (OPING_YELLOW, COLOR_YELLOW, /* default = */ 0);
init_pair (OPING_RED, COLOR_RED, /* default = */ 0);
+ init_pair (OPING_GREEN_HIST, COLOR_GREEN, COLOR_BLACK);
+ init_pair (OPING_YELLOW_HIST, COLOR_YELLOW, COLOR_GREEN);
+ init_pair (OPING_RED_HIST, COLOR_RED, COLOR_YELLOW);
}
main_win_height = height - (5 * host_num);
if (has_colors () == TRUE)
{
int color = OPING_GREEN;
- float ratio = 0;
- int index = 0;
-
- ratio = latency / PING_DEF_TTL;
- if (ratio > 2/3.0) {
- color = OPING_RED;
- }
- else if (ratio > 1/3.0) {
- color = OPING_YELLOW;
- }
- index = (int) (ratio * BARS_LEN * 3); /* 3 colors */
- /* HOST_PRINTF ("%%r%f-ia%d-", ratio, index); */
- index = index % (BARS_LEN-1);
- /* HOST_PRINTF ("im%d-", index); */
- if (index < 0 || index >= BARS_LEN) {
- index = 0; /* safety check */
- }
- wattron (main_win, COLOR_PAIR(color));
- HOST_PRINTF (bars[index]);
+ 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)))
+ color = OPING_YELLOW;
+
+ HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i ",
+ data_len, context->host, context->addr,
+ sequence, recv_ttl,
+ format_qos (recv_qos, recv_qos_str, sizeof (recv_qos_str)));
+ if ((recv_qos != 0) || (opt_send_qos != 0))
+ {
+ HOST_PRINTF ("qos=%s ",
+ format_qos (recv_qos, recv_qos_str, sizeof (recv_qos_str)));
+ }
+ HOST_PRINTF ("time=");
+ wattron (main_win, COLOR_PAIR(color));
+ HOST_PRINTF ("%.2f", latency);
wattroff (main_win, COLOR_PAIR(color));
+ HOST_PRINTF (" ms\n");
}
else
{
#if USE_NCURSES
if (has_colors () == TRUE)
{
+ HOST_PRINTF ("echo reply from %s (%s): icmp_seq=%u ",
+ context->host, context->addr,
+ sequence);
wattron (main_win, COLOR_PAIR(OPING_RED) | A_BOLD);
- HOST_PRINTF ("!");
+ HOST_PRINTF ("timeout");
wattroff (main_win, COLOR_PAIR(OPING_RED) | A_BOLD);
+ HOST_PRINTF ("\n");
}
else
{
projects / liboping.git / blobdiff