X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=graph.c;h=91ddc8937fa4ed53290742f1dc5a563266ec3b33;hb=b65c7ec44355b9bc4d6c5ee6613dfb895dace3d6;hp=6cf511d165a8d36880ba85164c0e82763ac18711;hpb=def0ac29a7eb92282cf7f208b229261bb254ca00;p=fio.git diff --git a/graph.c b/graph.c index 6cf511d1..91ddc893 100644 --- a/graph.c +++ b/graph.c @@ -24,12 +24,23 @@ #include #include #include +#include #include #include #include "tickmarks.h" #include "graph.h" +#include "flist.h" +#include "lib/prio_tree.h" +#include "gettime.h" +struct thread_data; +#include "time.h" + +/* + * Allowable difference to show tooltip + */ +#define TOOLTIP_DELTA 1.02 struct xyvalue { double x, y; @@ -37,6 +48,8 @@ struct xyvalue { struct graph_value { struct graph_value *next; + struct prio_tree_node node; + char *tooltip; void *value; }; @@ -45,11 +58,18 @@ struct graph_label { struct graph_value *tail; struct graph_value *values; struct graph_label *next; + struct prio_tree_root prio_tree; double r, g, b; int value_count; + unsigned int tooltip_count; struct graph *parent; }; +struct tick_value { + unsigned int offset; + double value; +}; + struct graph { char *title; char *xtitle; @@ -62,10 +82,18 @@ struct graph { const char *font; graph_axis_unit_change_callback x_axis_unit_change_callback; graph_axis_unit_change_callback y_axis_unit_change_callback; + unsigned int base_offset; double left_extra; double right_extra; double top_extra; double bottom_extra; + + double xtick_zero; + double xtick_delta; + double xtick_zero_val; + double ytick_zero; + double ytick_delta; + double ytick_zero_val; }; void graph_set_size(struct graph *g, unsigned int xdim, unsigned int ydim) @@ -302,7 +330,7 @@ static void graph_draw_common(struct graph *g, cairo_t *cr, cairo_set_source_rgb(cr, 0, 0, 0); cairo_set_line_width (cr, 0.8); - *x1 = 0.15 * g->xdim; + *x1 = 0.10 * g->xdim; *x2 = 0.95 * g->xdim; *y1 = 0.10 * g->ydim; *y2 = 0.90 * g->ydim; @@ -322,7 +350,7 @@ static void graph_draw_common(struct graph *g, cairo_t *cr, static void graph_draw_x_ticks(struct graph *g, cairo_t *cr, double x1, double y1, double x2, double y2, - double minx, double maxx, int nticks) + double minx, double maxx, int nticks, int add_tm_text) { struct tickmark *tm; double tx; @@ -330,13 +358,24 @@ static void graph_draw_x_ticks(struct graph *g, cairo_t *cr, static double dash[] = { 1.0, 2.0 }; nticks = calc_tickmarks(minx, maxx, nticks, &tm, &power_of_ten, - g->x_axis_unit_change_callback == NULL); + g->x_axis_unit_change_callback == NULL, g->base_offset); if (g->x_axis_unit_change_callback) g->x_axis_unit_change_callback(g, power_of_ten); for (i = 0; i < nticks; i++) { tx = (((tm[i].value) - minx) / (maxx - minx)) * (x2 - x1) + x1; - if (tx < x1 || tx > x2) + + /* + * Update tick delta + */ + if (!i) { + g->xtick_zero = tx; + g->xtick_zero_val = tm[0].value; + } else if (i == 1) + g->xtick_delta = (tm[1].value - tm[0].value) / (tx - g->xtick_zero); + + /* really tx < yx || tx > x2, but protect against rounding */ + if (x1 - tx > 0.01 || tx - x2 > 0.01) continue; /* Draw tick mark */ @@ -354,16 +393,18 @@ static void graph_draw_x_ticks(struct graph *g, cairo_t *cr, cairo_stroke(cr); cairo_restore(cr); + if (!add_tm_text) + continue; + /* draw tickmark label */ draw_centered_text(g, cr, tx, y2 * 1.04, 12.0, tm[i].string); cairo_stroke(cr); - } } -static void graph_draw_y_ticks(struct graph *g, cairo_t *cr, +static double graph_draw_y_ticks(struct graph *g, cairo_t *cr, double x1, double y1, double x2, double y2, - double miny, double maxy, int nticks) + double miny, double maxy, int nticks, int add_tm_text) { struct tickmark *tm; double ty; @@ -371,14 +412,33 @@ static void graph_draw_y_ticks(struct graph *g, cairo_t *cr, static double dash[] = { 2.0, 2.0 }; nticks = calc_tickmarks(miny, maxy, nticks, &tm, &power_of_ten, - g->y_axis_unit_change_callback == NULL); + g->y_axis_unit_change_callback == NULL, g->base_offset); if (g->y_axis_unit_change_callback) g->y_axis_unit_change_callback(g, power_of_ten); + /* + * Use highest tickmark as top of graph, not highest value. Otherwise + * it's impossible to see what the max value is, if the graph is + * fairly flat. + */ + maxy = tm[nticks - 1].value; + for (i = 0; i < nticks; i++) { ty = y2 - (((tm[i].value) - miny) / (maxy - miny)) * (y2 - y1); - if (ty < y1 || ty > y2) + + /* + * Update tick delta + */ + if (!i) { + g->ytick_zero = ty; + g->ytick_zero_val = tm[0].value; + } else if (i == 1) + g->ytick_delta = (tm[1].value - tm[0].value) / (ty - g->ytick_zero); + + /* really ty < y1 || ty > y2, but protect against rounding */ + if (y1 - ty > 0.01 || ty - y2 > 0.01) continue; + /* draw tick mark */ cairo_move_to(cr, x1, ty); cairo_line_to(cr, x1 - (x2 - x1) * 0.02, ty); @@ -393,10 +453,18 @@ static void graph_draw_y_ticks(struct graph *g, cairo_t *cr, cairo_stroke(cr); cairo_restore(cr); + if (!add_tm_text) + continue; + /* draw tickmark label */ draw_right_justified_text(g, cr, x1 - (x2 - x1) * 0.025, ty, 12.0, tm[i].string); cairo_stroke(cr); } + + /* + * Return new max to use + */ + return maxy; } void bar_graph_draw(struct graph *bg, cairo_t *cr) @@ -412,9 +480,16 @@ void bar_graph_draw(struct graph *bg, cairo_t *cr) graph_draw_common(bg, cr, &x1, &y1, &x2, &y2); nlabels = count_labels(bg->labels); - space_per_label = (x2 - x1) / (double) nlabels; + space_per_label = (x2 - x1) / (double) nlabels; + /* + * Start bars at 0 unless we have negative values, otherwise we + * present a skewed picture comparing label X and X+1. + */ mindata = find_min_data(bg->labels); + if (mindata > 0) + mindata = 0; + maxdata = find_max_data(bg->labels); if (fabs(maxdata - mindata) < 1e-20) { @@ -424,8 +499,7 @@ void bar_graph_draw(struct graph *bg, cairo_t *cr) return; } - graph_draw_y_ticks(bg, cr, x1, y1, x2, y2, mindata, maxdata, 10); - + maxdata = graph_draw_y_ticks(bg, cr, x1, y1, x2, y2, mindata, maxdata, 10, 1); i = 0; for (lb = bg->labels; lb; lb = lb->next) { int nvalues; @@ -491,6 +565,15 @@ void line_graph_draw(struct graph *g, cairo_t *cr) minx = find_xy_value(g, getx, mindouble); maxx = find_xy_value(g, getx, maxdouble); miny = find_xy_value(g, gety, mindouble); + + /* + * Start graphs at zero, unless we have a value below. Otherwise + * it's hard to visually compare the read and write graph, since + * the lowest valued one will be the floor of the graph view. + */ + if (miny > 0) + miny = 0; + maxy = find_xy_value(g, gety, maxdouble); if (fabs(maxx - minx) < 1e-20 || fabs(maxy - miny) < 1e-20) { @@ -520,8 +603,8 @@ void line_graph_draw(struct graph *g, cairo_t *cr) gminy = miny - bottom_extra; gmaxy = maxy + top_extra; - graph_draw_x_ticks(g, cr, x1, y1, x2, y2, gminx, gmaxx, 10); - graph_draw_y_ticks(g, cr, x1, y1, x2, y2, gminy, gmaxy, 10); + graph_draw_x_ticks(g, cr, x1, y1, x2, y2, gminx, gmaxx, 10, good_data); + gmaxy = graph_draw_y_ticks(g, cr, x1, y1, x2, y2, gminy, gmaxy, 10, good_data); if (!good_data) goto skip_data; @@ -531,6 +614,7 @@ void line_graph_draw(struct graph *g, cairo_t *cr) first = 1; if (i->r < 0) /* invisible data */ continue; + cairo_set_source_rgb(cr, i->r, i->g, i->b); for (j = i->values; j; j = j->next) { tx = ((getx(j) - gminx) / (gmaxx - gminx)) * (x2 - x1) + x1; @@ -550,15 +634,9 @@ skip_data: } -static void gfree(void *f) -{ - if (f) - free(f); -} - static void setstring(char **str, const char *value) { - gfree(*str); + free(*str); *str = strdup(value); } @@ -604,14 +682,20 @@ void graph_add_label(struct graph *bg, const char *label) else bg->tail->next = i; bg->tail = i; + INIT_PRIO_TREE_ROOT(&i->prio_tree); } -static void graph_label_add_value(struct graph_label *i, void *value) +static void graph_label_add_value(struct graph_label *i, void *value, + const char *tooltip) { struct graph_value *x; x = malloc(sizeof(*x)); x->value = value; + if (tooltip) + x->tooltip = strdup(tooltip); + else + x->tooltip = NULL; x->next = NULL; if (!i->tail) { i->values = x; @@ -621,6 +705,21 @@ static void graph_label_add_value(struct graph_label *i, void *value) i->tail = x; i->value_count++; + if (x->tooltip) { + double yval = gety(x); + double miny = yval / TOOLTIP_DELTA; + double maxy = yval * TOOLTIP_DELTA; + + x->node.start = miny; + x->node.last = maxy; + if (x->node.last == x->node.start) + x->node.last++; + + prio_tree_insert(&i->prio_tree, &x->node); + printf("insert (x=%u,y=%u) range %lu-%lu (%s)\n", (int)getx(x), (int)gety(x), x->node.start, x->node.last, x->tooltip); + i->tooltip_count++; + } + if (i->parent->per_label_limit != -1 && i->value_count > i->parent->per_label_limit) { int to_drop = 1; @@ -637,6 +736,11 @@ static void graph_label_add_value(struct graph_label *i, void *value) while (to_drop--) { x = i->values; i->values = i->values->next; + if (x->tooltip) { + free(x->tooltip); + prio_tree_remove(&i->prio_tree, &x->node); + i->tooltip_count--; + } free(x->value); free(x); i->value_count--; @@ -655,12 +759,12 @@ int graph_add_data(struct graph *bg, const char *label, const double value) i = graph_find_label(bg, label); if (!i) return -1; - graph_label_add_value(i, d); + graph_label_add_value(i, d, NULL); return 0; } int graph_add_xy_data(struct graph *bg, const char *label, - const double x, const double y) + const double x, const double y, const char *tooltip) { struct graph_label *i; struct xyvalue *xy; @@ -672,7 +776,8 @@ int graph_add_xy_data(struct graph *bg, const char *label, i = graph_find_label(bg, label); if (!i) return -1; - graph_label_add_value(i, xy); + + graph_label_add_value(i, xy, tooltip); return 0; } @@ -682,8 +787,8 @@ static void graph_free_values(struct graph_value *values) for (i = values; i; i = next) { next = i->next; - gfree(i->value); - gfree(i); + free(i->value); + free(i); } } @@ -694,7 +799,7 @@ static void graph_free_labels(struct graph_label *labels) for (i = labels; i; i = next) { next = i->next; graph_free_values(i->values); - gfree(i); + free(i); } } @@ -718,7 +823,7 @@ void graph_set_color(struct graph *gr, const char *label, if (g > 1.0) g = 1.0; if (b > 1.0) - b =1.0; + b = 1.0; } for (i = gr->labels; i; i = i->next) @@ -732,9 +837,9 @@ void graph_set_color(struct graph *gr, const char *label, void graph_free(struct graph *bg) { - gfree(bg->title); - gfree(bg->xtitle); - gfree(bg->ytitle); + free(bg->title); + free(bg->xtitle); + free(bg->ytitle); graph_free_labels(bg->labels); } @@ -756,4 +861,97 @@ void graph_add_extra_space(struct graph *g, double left_percent, double right_pe g->bottom_extra = bottom_percent; } +/* + * Normally values are logged in a base unit of 0, but for other purposes + * it makes more sense to log in higher unit. For instance for bandwidth + * purposes, you may want to log in KB/sec (or MB/sec) rather than bytes/sec. + */ +void graph_set_base_offset(struct graph *g, unsigned int base_offset) +{ + g->base_offset = base_offset; +} + +int graph_has_tooltips(struct graph *g) +{ + struct graph_label *i; + + for (i = g->labels; i; i = i->next) + if (i->tooltip_count) + return 1; + + return 0; +} + +int graph_contains_xy(struct graph *g, int x, int y) +{ + int first_x = g->xoffset; + int last_x = g->xoffset + g->xdim; + int first_y = g->yoffset; + int last_y = g->yoffset + g->ydim; + + return (x >= first_x && x <= last_x) && (y >= first_y && y <= last_y); +} +const char *graph_find_tooltip(struct graph *g, int ix, int iy) +{ + double x = ix, y = iy; + struct prio_tree_iter iter; + struct prio_tree_node *n; + struct graph_label *i; + struct graph_value *best = NULL; + double best_delta; + double maxx, minx; + + x -= g->xoffset; + y -= g->yoffset; + + x = g->xtick_zero_val + ((x - g->xtick_zero) * g->xtick_delta); + y = g->ytick_zero_val + ((y - g->ytick_zero) * g->ytick_delta); + + maxx = x * TOOLTIP_DELTA; + minx = x / TOOLTIP_DELTA; + best_delta = UINT_MAX; + i = g->labels; + do { + prio_tree_iter_init(&iter, &i->prio_tree, y, y); + + n = prio_tree_next(&iter); + if (!n) + continue; + + do { + struct graph_value *v; + double xval, xdiff; + + v = container_of(n, struct graph_value, node); + xval = getx(v); + + if (xval > x) + xdiff = xval - x; + else + xdiff = x - xval; + + /* + * zero delta, or within or match critera, break + */ + if (xdiff < best_delta) { + best_delta = xdiff; + if (!best_delta || + (xval >= minx && xval <= maxx)) { + best = v; + break; + } + } + } while ((n = prio_tree_next(&iter)) != NULL); + + /* + * If we got matches in one label, don't check others. + */ + break; + } while ((i = i->next) != NULL); + + if (best) + return best->tooltip; + + return NULL; +}