Handle duplicate hosts without visual corruption

[liboping.git] / src / oping.c

diff --git a/src/oping.c b/src/oping.c
index e2252a2..47249b5 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
@@ -82,11 +82,17 @@
 /* http://newsgroups.derkeiler.com/Archive/Rec/rec.games.roguelike.development/2010-09/msg00050.html */
 # define _X_OPEN_SOURCE_EXTENDED
 
-# if HAVE_NCURSESW_NCURSES_H
-#  include <ncursesw/ncurses.h>
-# elif HAVE_NCURSES_H
+#if defined HAVE_NCURSESW_CURSES_H
+#  include <ncursesw/curses.h>
+#elif defined HAVE_NCURSESW_H
+#  include <ncursesw.h>
+#elif defined HAVE_NCURSES_CURSES_H
+#  include <ncurses/curses.h>
+#elif defined HAVE_NCURSES_H
 #  include <ncurses.h>
-# endif
+#else
+#  error "SysV or X/Open-compatible Curses header file required"
+#endif
 
 # define OPING_GREEN 1
 # define OPING_YELLOW 2
@@ -172,7 +178,7 @@ typedef struct ping_context
         * and HISTORY_SIZE_MAX. */
        size_t history_size;
 
-       /* Number "received" entries in the history, i.e. non-NAN entries. */
+       /* Total number of reponses received. */
        size_t history_received;
 
        /* Index of the next RTT to be written to history_by_time. This wraps
@@ -226,22 +232,17 @@ static void sigint_handler (int signal) /* {{{ */
        opt_count = 0;
 } /* }}} void sigint_handler */
 
-static ping_context_t *context_create (void) /* {{{ */
+static ping_context_t *context_create () /* {{{ */
 {
-       ping_context_t *ret;
-
-       if ((ret = malloc (sizeof (ping_context_t))) == NULL)
+       ping_context_t *ctx = calloc (1, sizeof (*ctx));
+       if (ctx == NULL)
                return (NULL);
 
-       memset (ret, '\0', sizeof (ping_context_t));
-
-       ret->latency_total = 0.0;
-
 #if USE_NCURSES
-       ret->window = NULL;
+       ctx->window = NULL;
 #endif
 
-       return (ret);
+       return (ctx);
 } /* }}} ping_context_t *context_create */
 
 static void context_destroy (ping_context_t *context) /* {{{ */
@@ -296,7 +297,7 @@ static void clean_history (ping_context_t *ctx) /* {{{ */
        /* 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;
+                       ctx->history_by_value[i] = NAN;
 
        /* Sort all RTTs. */
        qsort (ctx->history_by_value, ctx->history_size, sizeof
@@ -414,11 +415,13 @@ static int ping_initialize_contexts (pingobj_t *ping) /* {{{ */
        {
                ping_context_t *context;
                size_t buffer_size;
+               int i;
 
                context = ping_iterator_get_context(iter);
 
                /* if this is a previously existing host, do not recreate it */
-               if (context != NULL) {
+               if (context != NULL)
+               {
                        history_size = context->history_size;
                        context->index = index++;
                        continue;
@@ -430,9 +433,8 @@ static int ping_initialize_contexts (pingobj_t *ping) /* {{{ */
                /* 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++) {
+               for (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);
@@ -1322,6 +1324,8 @@ static int on_resize (pingobj_t *ping) /* {{{ */
 
                if (context->window != NULL)
                {
+                        werase (context->window);
+                        wrefresh (context->window);
                        delwin (context->window);
                        context->window = NULL;
                }
@@ -1354,12 +1358,12 @@ static int check_resize (pingobj_t *ping) /* {{{ */
                }
                else if (key == 'a')
                {
-                       char host[80];
+                       char host[NI_MAXHOST];
 
-                       wprintw(main_win, "New Host: ");
-                       echo();
-                       wgetnstr(main_win, host, sizeof(host));
-                       noecho();
+                       wprintw (main_win, "New Host: ");
+                       echo ();
+                       wgetnstr (main_win, host, sizeof (host));
+                       noecho ();
 
                        if (ping_host_add(ping, host) < 0)
                        {
@@ -1369,11 +1373,10 @@ static int check_resize (pingobj_t *ping) /* {{{ */
                        }
                        else
                        {
-                               /* FIXME - scroll main_win correctly so that
-                                       old data is still visible */
-
+                               /* FIXME - scroll main_win correctly so that old
+                                * data is still visible */
                                need_resize = 1;
-                               host_num++;
+                               host_num = ping_iterator_count(ping);
                                ping_initialize_contexts(ping);
                        }
                }
@@ -1405,10 +1408,11 @@ static int pre_loop_hook (pingobj_t *ping) /* {{{ */
        if (has_colors () == TRUE)
        {
                start_color ();
-               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);
+               use_default_colors ();
+               init_pair (OPING_GREEN,  COLOR_GREEN,  /* default = */ -1);
+               init_pair (OPING_YELLOW, COLOR_YELLOW, /* default = */ -1);
+               init_pair (OPING_RED,    COLOR_RED,    /* default = */ -1);
+               init_pair (OPING_GREEN_HIST,  COLOR_GREEN,  -1);
                init_pair (OPING_YELLOW_HIST, COLOR_YELLOW, COLOR_GREEN);
                init_pair (OPING_RED_HIST,    COLOR_RED,    COLOR_YELLOW);
        }
@@ -1659,11 +1663,10 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */
 
        if (outfile != NULL)
        {
-               struct timespec ts = { 0, 0 };
-
-               if (clock_gettime (CLOCK_REALTIME, &ts) == 0)
+               struct timeval tv = {0};
+               if (gettimeofday (&tv, NULL) == 0)
                {
-                       double t = ((double) ts.tv_sec) + (((double) ts.tv_nsec) / 1000000000.0);
+                       double t = ((double) tv.tv_sec) + (((double) tv.tv_usec) / 1000000.0);
 
                        if ((sequence % 32) == 0)
                                fprintf (outfile, "#time,host,latency[ms]\n");