From: Florian Forster Date: Mon, 8 May 2017 14:23:52 +0000 (+0200) Subject: Merge remote-tracking branch 'github/pr/20' X-Git-Url: https://git.tokkee.org/?p=liboping.git;a=commitdiff_plain;h=1e43ebd101e03b69931c82606635ddfd82496e24;hp=-c Merge remote-tracking branch 'github/pr/20' --- 1e43ebd101e03b69931c82606635ddfd82496e24 diff --combined src/oping.c index 528c90d,e3cb696..f48309a --- a/src/oping.c +++ b/src/oping.c @@@ -82,17 -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 -# elif HAVE_NCURSES_H +#if defined HAVE_NCURSESW_CURSES_H +# include +#elif defined HAVE_NCURSESW_H +# include +#elif defined HAVE_NCURSES_CURSES_H +# include +#elif defined HAVE_NCURSES_H # include -# endif +#else +# error "SysV or X/Open-compatible Curses header file required" +#endif # define OPING_GREEN 1 # define OPING_YELLOW 2 @@@ -178,7 -172,7 +178,7 @@@ typedef struct ping_contex * 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 @@@ -232,17 -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) /* {{{ */ @@@ -294,6 -293,11 +294,11 @@@ static void clean_history (ping_context 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; + /* Sort all RTTs. */ qsort (ctx->history_by_value, ctx->history_size, sizeof (ctx->history_by_value[0]), compare_double); @@@ -398,6 -402,7 +403,7 @@@ static int ping_initialize_contexts (pi { pingobj_iter_t *iter; int index; + size_t history_size = 0; if (ping == NULL) return (EINVAL); @@@ -409,10 -414,27 +415,27 @@@ { 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) + { + 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 (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); @@@ -1000,7 -1022,7 +1023,7 @@@ static int update_graph_boxplot (ping_c } /* }}} 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; @@@ -1047,6 -1069,10 +1070,10 @@@ index = (history_offset + x) % ctx->history_size; latency = ctx->history_by_time[index]; + if (latency < 0) { + continue; + } + if (latency >= 0.0) { double ratio; @@@ -1218,12 -1244,6 +1245,6 @@@ static int update_stats_from_context (p 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); @@@ -1259,7 -1279,7 +1280,7 @@@ } 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) @@@ -1333,6 -1353,30 +1354,30 @@@ static int check_resize (pingobj_t *pin else if (opt_show_graph > 0) opt_show_graph++; } + else if (key == 'a') + { + char host[NI_MAXHOST]; + + 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 + { + /* FIXME - scroll main_win correctly so that old + * data is still visible */ + need_resize = 1; + host_num++; + ping_initialize_contexts(ping); + } + } } if (need_resize) @@@ -1361,11 -1405,10 +1406,11 @@@ static int pre_loop_hook (pingobj_t *pi 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); } @@@ -1616,10 -1659,11 +1661,10 @@@ static void update_host_hook (pingobj_i 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");