X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Foping.c;h=5e63392092acbaa7b3dea0d76be3161c5e846cbd;hb=4834a347c0d674ff7a03768ead08dd02b5590c5f;hp=b7ef0454395a60c8da3d4666ee16e861b01651c1;hpb=648990aca5450fe59161ee1f8f4a4c6817a55b15;p=liboping.git diff --git a/src/oping.c b/src/oping.c index b7ef045..5e63392 100644 --- a/src/oping.c +++ b/src/oping.c @@ -123,14 +123,15 @@ static size_t const hist_colors_num = sizeof (hist_colors_utf8) #endif /* "─" */ -#define BOXPLOT_WHISKER_BAR (113 | A_ALTCHARSET) +#define BOXPLOT_WHISKER_BAR (113 | A_ALTCHARSET) /* "├" */ -#define BOXPLOT_WHISKER_LEFT_END (116 | A_ALTCHARSET) +#define BOXPLOT_WHISKER_LEFT_END (116 | A_ALTCHARSET) /* "┤" */ #define BOXPLOT_WHISKER_RIGHT_END (117 | A_ALTCHARSET) -#define BOXPLOT_BOX ' ' -/* "│" */ -#define BOXPLOT_MEDIAN (120 | A_ALTCHARSET) +/* Inverted */ +#define BOXPLOT_BOX ' ' +/* "│", inverted */ +#define BOXPLOT_MEDIAN (120 | A_ALTCHARSET) #include "oping.h" @@ -163,7 +164,9 @@ typedef struct ping_context /* 1000 + one "infinity" bucket. */ #define OPING_HISTOGRAM_BUCKETS 1001 - uint32_t *latency_histogram; + uint32_t *histogram_counters; + uint32_t *histogram_accumulated; + double *histogram_ratio; size_t latency_histogram_size; #if USE_NCURSES @@ -183,6 +186,7 @@ static uint8_t opt_send_qos = 0; static double opt_percentile = -1.0; static double opt_exit_status_threshold = 1.0; #if USE_NCURSES +static int opt_show_graph = 1; static int opt_utf8 = 0; #endif @@ -215,8 +219,12 @@ static ping_context_t *context_create (void) /* {{{ */ 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)); + ret->histogram_counters = calloc (ret->latency_histogram_size, + sizeof (*ret->histogram_counters)); + ret->histogram_accumulated = calloc (ret->latency_histogram_size, + sizeof (*ret->histogram_accumulated)); + ret->histogram_ratio = calloc (ret->latency_histogram_size, + sizeof (*ret->histogram_ratio)); #if USE_NCURSES ret->window = NULL; @@ -238,8 +246,14 @@ static void context_destroy (ping_context_t *context) /* {{{ */ } #endif - free (context->latency_histogram); - context->latency_histogram = NULL; + free (context->histogram_counters); + context->histogram_counters = NULL; + + free (context->histogram_accumulated); + context->histogram_accumulated = NULL; + + free (context->histogram_ratio); + context->histogram_ratio = NULL; free (context); } /* }}} void context_destroy */ @@ -262,27 +276,16 @@ static double context_get_percentile (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; + double ret; - if (ctx->latency_histogram == NULL) + if (ctx->histogram_ratio == NULL) return (NAN); - 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]; - for (i = 0; i < ctx->latency_histogram_size; i++) - { - ratios[i] = ((double) accumulated[i]) / ((double) num); - if (ratios[i] >= threshold) + if (ctx->histogram_ratio[i] >= threshold) break; - } if (i >= ctx->latency_histogram_size) return (NAN); @@ -293,7 +296,13 @@ static double context_get_percentile (ping_context_t *ctx, /* {{{ */ /* Multiply with i+1, because we're interested in the _upper_ bound of * each bucket. */ - return (index_to_ms_factor * ((double) (i + 1))); + ret = (index_to_ms_factor * ((double) (i + 1))); + + /* Avoid reporting a higher latency than latency_max. */ + if (ret > ctx->latency_max) + ret = ctx->latency_max; + + return (ret); } /* }}} double context_get_percentile */ static double context_get_stddev (ping_context_t *ctx) /* {{{ */ @@ -376,6 +385,7 @@ static void usage_exit (const char *name, int status) /* {{{ */ " -f filename filename to read hosts from\n" #if USE_NCURSES " -u / -U force / disable UTF-8 output\n" + " -g graph graph type to draw\n" #endif " -P percent Report the n'th percentile of latency\n" " -Z percent Exit with non-zero exit status if more than this percentage of\n" @@ -584,7 +594,7 @@ static int read_options (int argc, char **argv) /* {{{ */ { optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:P:" #if USE_NCURSES - "uU" + "uUg:" #endif ); @@ -678,6 +688,19 @@ static int read_options (int argc, char **argv) /* {{{ */ break; #if USE_NCURSES + case 'g': + if (strcasecmp ("none", optarg) == 0) + 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 = 3; + else + fprintf (stderr, "Unknown graph option: %s\n", optarg); + break; + case 'u': opt_utf8 = 2; break; @@ -707,6 +730,7 @@ static int read_options (int argc, char **argv) /* {{{ */ case 'h': usage_exit (argv[0], 0); break; + default: usage_exit (argv[0], 1); } @@ -783,40 +807,27 @@ static _Bool has_utf8() /* {{{ */ # endif } /* }}} _Bool has_utf8 */ -static int update_boxplot (ping_context_t *ctx) /* {{{ */ +static int update_graph_boxplot (ping_context_t *ctx) /* {{{ */ { - uint32_t *accumulated; double *ratios; - uint32_t num; size_t i; size_t x_max; size_t x; 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)); ratios = calloc (x_max, sizeof (*ratios)); /* Downsample */ for (i = 0; i < ctx->latency_histogram_size; i++) { x = i * x_max / ctx->latency_histogram_size; - accumulated[x] += ctx->latency_histogram[i]; + ratios[x] = ctx->histogram_ratio[i]; } - /* Sum */ - for (x = 1; x < x_max; x++) - accumulated[x] += accumulated[x - 1]; - - num = accumulated[x_max - 1]; - - /* Calculate ratios */ - for (x = 0; x < x_max; x++) - ratios[x] = ((double) accumulated[x]) / ((double) num); - for (x = 0; x < x_max; x++) { int symbol = ' '; @@ -876,11 +887,10 @@ static int update_boxplot (ping_context_t *ctx) /* {{{ */ } free (ratios); - free (accumulated); return (0); -} /* }}} int update_boxplot */ +} /* }}} int update_graph_boxplot */ -static int update_prettyping_graph (ping_context_t *ctx, /* {{{ */ +static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */ double latency, unsigned int sequence) { int color = OPING_RED; @@ -957,7 +967,93 @@ static int update_prettyping_graph (ping_context_t *ctx, /* {{{ */ wprintw (ctx->window, " "); return (0); -} /* }}} int update_prettyping_graph */ +} /* }}} int update_graph_prettyping */ + +static int update_graph_histogram (ping_context_t *ctx) /* {{{ */ +{ + uint32_t *counters; + uint32_t *accumulated; + uint32_t num; + uint32_t max; + size_t i; + size_t x_max; + size_t x; + + size_t symbols_num = hist_symbols_acs_num; + + if (has_utf8 ()) + symbols_num = hist_symbols_utf8_num; + + x_max = (size_t) getmaxx (ctx->window); + if (x_max <= 4) + return (EINVAL); + x_max -= 4; + + counters = calloc (x_max, sizeof (*counters)); + accumulated = calloc (x_max, sizeof (*accumulated)); + + /* Downsample */ + max = 0; + for (i = 0; i < ctx->latency_histogram_size; i++) + { + x = i * x_max / ctx->latency_histogram_size; + counters[x] += ctx->histogram_counters[i]; + accumulated[x] = counters[x]; + + if (max < counters[x]) + max = counters[x]; + } + + /* Sum */ + for (x = 1; x < x_max; x++) + accumulated[x] += accumulated[x - 1]; + num = accumulated[x_max - 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_prev = 0.0; + size_t index; + int color = 0; + + index = (size_t) (height * ((double) symbols_num)); + if (index >= symbols_num) + index = symbols_num - 1; + + if (x > 0) + ratio_prev = ((double) accumulated[x - 1]) / ((double) num); + + if (has_colors () == TRUE) + { + if ((ratio_this <= 0.5) || ((ratio_prev < 0.5) && (ratio_this > 0.5))) + color = OPING_GREEN; + else if ((ratio_this <= 0.95) || ((ratio_prev < 0.95) && (ratio_this > 0.95))) + color = OPING_YELLOW; + else + color = OPING_RED; + + wattron (ctx->window, COLOR_PAIR(color)); + } + + if (counters[x] == 0) + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, ' '); + else if (has_utf8 ()) + mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, + hist_symbols_utf8[index]); + else + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, + hist_symbols_acs[index] | A_ALTCHARSET); + + if (has_colors () == TRUE) + wattroff (ctx->window, COLOR_PAIR(color)); + + } + + free (accumulated); + return (0); +} /* }}} int update_graph_histogram */ static int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter) /* {{{ */ { @@ -1011,7 +1107,12 @@ static int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter) deviation); } - update_prettyping_graph (ctx, latency, sequence); + if (opt_show_graph == 1) + update_graph_prettyping (ctx, latency, sequence); + else if (opt_show_graph == 2) + update_graph_boxplot (ctx); + else if (opt_show_graph == 3) + update_graph_histogram (ctx); wrefresh (ctx->window); @@ -1024,12 +1125,13 @@ static int on_resize (pingobj_t *ping) /* {{{ */ int width = 0; int height = 0; int main_win_height; + int box_height = (opt_show_graph == 0) ? 4 : 5; getmaxyx (stdscr, height, width); if ((height < 1) || (width < 1)) return (EINVAL); - main_win_height = height - (5 * host_num); + main_win_height = height - (box_height * host_num); wresize (main_win, main_win_height, /* width = */ width); /* Allow scrolling */ scrollok (main_win, TRUE); @@ -1053,9 +1155,9 @@ static int on_resize (pingobj_t *ping) /* {{{ */ delwin (context->window); context->window = NULL; } - context->window = newwin (/* height = */ 5, + context->window = newwin (/* height = */ box_height, /* width = */ width, - /* y = */ main_win_height + (5 * context->index), + /* y = */ main_win_height + (box_height * context->index), /* x = */ 0); } @@ -1087,6 +1189,7 @@ static int pre_loop_hook (pingobj_t *ping) /* {{{ */ int width = 0; int height = 0; int main_win_height; + int box_height = (opt_show_graph == 0) ? 4 : 5; initscr (); cbreak (); @@ -1108,7 +1211,7 @@ static int pre_loop_hook (pingobj_t *ping) /* {{{ */ init_pair (OPING_RED_HIST, COLOR_RED, COLOR_YELLOW); } - main_win_height = height - (5 * host_num); + main_win_height = height - (box_height * host_num); main_win = newwin (/* height = */ main_win_height, /* width = */ width, /* y = */ 0, /* x = */ 0); @@ -1135,9 +1238,9 @@ static int pre_loop_hook (pingobj_t *ping) /* {{{ */ delwin (context->window); context->window = NULL; } - context->window = newwin (/* height = */ 5, + context->window = newwin (/* height = */ box_height, /* width = */ width, - /* y = */ main_win_height + (5 * context->index), + /* y = */ main_win_height + (box_height * context->index), /* x = */ 0); } @@ -1203,9 +1306,24 @@ static int post_sleep_hook (__attribute__((unused)) pingobj_t *ping) /* {{{ */ } /* }}} int post_sleep_hook */ #endif +static size_t latency_to_bucket (ping_context_t *ctx, double latency) /* {{{ */ +{ + size_t bucket; + + /* latency is in ms, opt_interval is in s. */ + bucket = (size_t) ((latency * (ctx->latency_histogram_size - 1)) + / (1000.0 * opt_interval)); + if (bucket >= ctx->latency_histogram_size) + bucket = ctx->latency_histogram_size - 1; + + return (bucket); +} /* }}} size_t latency_to_bucket */ + static void update_context (ping_context_t *context, double latency) /* {{{ */ { size_t bucket; + size_t i; + double num; context->req_rcvd++; context->latency_total += latency; @@ -1216,15 +1334,19 @@ static void update_context (ping_context_t *context, double latency) /* {{{ */ if ((context->latency_min < 0.0) || (context->latency_min > latency)) context->latency_min = latency; - if (context->latency_histogram == NULL) - return; + bucket = latency_to_bucket (context, latency); + num = (double) context->req_rcvd; - /* 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]++; + context->histogram_counters[bucket]++; + + context->histogram_accumulated[0] = context->histogram_counters[0]; + context->histogram_ratio[0] = ((double) context->histogram_accumulated[0]) / num; + for (i = 1; i < context->latency_histogram_size; i++) + { + context->histogram_accumulated[i] = context->histogram_accumulated[i - 1] + + context->histogram_counters[i]; + context->histogram_ratio[i] = ((double) context->histogram_accumulated[i]) / num; + } } /* }}} void update_context */ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */ @@ -1279,16 +1401,26 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */ #if USE_NCURSES if (has_colors () == TRUE) { + size_t bucket; + double ratio_this; + double ratio_prev; 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))) + bucket = latency_to_bucket (context, latency); + ratio_this = context->histogram_ratio[bucket]; + if (bucket > 0) + ratio_prev = context->histogram_ratio[bucket - 1]; + else + ratio_prev = 0.0; + + if ((ratio_this <= 0.5) || + ((ratio_prev < 0.5) && (ratio_this > 0.5))) + color = OPING_GREEN; + else if ((ratio_this <= 0.95) || + ((ratio_prev < 0.95) && (ratio_this > 0.95))) 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,