Ensure that impossibly latency values do not affect stats

[liboping.git] / src / oping.c

diff --git a/src/oping.c b/src/oping.c
index 883c862..b4999c5 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
@@ -209,6 +209,7 @@ 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 FILE *outfile = NULL;
@@ -292,6 +293,11 @@ static void clean_history (ping_context_t *ctx) /* {{{ */
        memcpy (ctx->history_by_value, ctx->history_by_time,
                        sizeof (ctx->history_by_time));
 
+        /* Remove impossible values */
+       for (i = 0; i < ctx->history_size; i++)
+                if (ctx->history_by_value[i]<0)
+                        ctx->history_by_value[i]=NAN;
+
        /* Sort all RTTs. */
        qsort (ctx->history_by_value, ctx->history_size, sizeof
                        (ctx->history_by_value[0]), compare_double);
@@ -652,7 +658,7 @@ static int read_options (int argc, char **argv) /* {{{ */
 
        while (1)
        {
-               optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:O:P:m:w:"
+               optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:O:P:m:w:b"
 #if USE_NCURSES
                                "uUg:"
 #endif
@@ -791,6 +797,9 @@ static int read_options (int argc, char **argv) /* {{{ */
                                opt_utf8 = 1;
                                break;
 #endif
+                       case 'b':
+                               opt_bell = 1;
+                               break;
 
                        case 'Z':
                        {
@@ -995,7 +1004,7 @@ static int update_graph_boxplot (ping_context_t *ctx) /* {{{ */
 } /* }}} int update_graph_boxplot */
 
 static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */
-               double latency, unsigned int sequence)
+               double latency)
 {
        size_t x;
        size_t x_max;
@@ -1042,6 +1051,10 @@ static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */
                index = (history_offset + x) % ctx->history_size;
                latency = ctx->history_by_time[index];
 
+                if (latency < 0) {
+                        continue;
+                }
+
                if (latency >= 0.0)
                {
                        double ratio;
@@ -1213,12 +1226,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);
 
@@ -1254,7 +1261,7 @@ static int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter)
        }
 
        if (opt_show_graph == 1)
-               update_graph_prettyping (ctx, latency, sequence);
+               update_graph_prettyping (ctx, latency);
        else if (opt_show_graph == 2)
                update_graph_histogram (ctx);
        else if (opt_show_graph == 3)
@@ -1576,6 +1583,13 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */
 #if USE_NCURSES
                }
 #endif
+                if (opt_bell) {
+#if USE_NCURSES
+                       beep();
+#else
+                       HOST_PRINTF ("\a");
+#endif
+                }
        }
        else /* if (!(latency > 0.0)) */
        {