X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=graph.c;h=e05e0723eef3bff87bcf6e9ff5fb387ea34b6368;hp=663fe38035b033b74e4455e118af159e4f6c5f15;hb=3d43382c7864753728b181ac356222d67bdd4a3f;hpb=38afe8338b4591e63eb650cfedbab7553fe4df7c diff --git a/graph.c b/graph.c index 663fe380..e05e0723 100644 --- a/graph.c +++ b/graph.c @@ -24,11 +24,20 @@ #include #include #include +#include #include #include #include "tickmarks.h" +#include "graph.h" +#include "flist.h" +#include "lib/prio_tree.h" + +/* + * Allowable difference to show tooltip + */ +#define TOOLTIP_DELTA 0.08 struct xyvalue { double x, y; @@ -36,6 +45,8 @@ struct xyvalue { struct graph_value { struct graph_value *next; + struct prio_tree_node node; + char *tooltip; void *value; }; @@ -44,29 +55,64 @@ 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; char *ytitle; unsigned int xdim, ydim; + double xoffset, yoffset; struct graph_label *labels; struct graph_label *tail; int per_label_limit; 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 xtick_one_val; + double ytick_zero; + double ytick_delta; + double ytick_zero_val; + double ytick_one_val; }; +void graph_set_size(struct graph *g, unsigned int xdim, unsigned int ydim) +{ + g->xdim = xdim; + g->ydim = ydim; +} + +void graph_set_position(struct graph *g, double xoffset, double yoffset) +{ + g->xoffset = xoffset; + g->yoffset = yoffset; +} + struct graph *graph_new(unsigned int xdim, unsigned int ydim, const char *font) { struct graph *g; g = calloc(1, sizeof(*g)); - g->xdim = xdim; - g->ydim = ydim; + graph_set_size(g, xdim, ydim); g->per_label_limit = -1; g->font = font; if (!g->font) @@ -74,6 +120,16 @@ struct graph *graph_new(unsigned int xdim, unsigned int ydim, const char *font) return g; } +void graph_x_axis_unit_change_notify(struct graph *g, graph_axis_unit_change_callback f) +{ + g->x_axis_unit_change_callback = f; +} + +void graph_y_axis_unit_change_notify(struct graph *g, graph_axis_unit_change_callback f) +{ + g->y_axis_unit_change_callback = f; +} + static int count_labels(struct graph_label *labels) { int count = 0; @@ -186,22 +242,62 @@ static void draw_bars(struct graph *bg, cairo_t *cr, struct graph_label *lb, } } -static void draw_centered_text(struct graph *g, cairo_t *cr, double x, double y, - double fontsize, const char *text) +static void draw_aligned_text(struct graph *g, cairo_t *cr, double x, double y, + double fontsize, const char *text, int alignment) { +#define CENTERED 0 +#define LEFT_JUSTIFIED 1 +#define RIGHT_JUSTIFIED 2 + + double factor, direction; cairo_text_extents_t extents; + switch(alignment) { + case CENTERED: + direction = -1.0; + factor = 0.5; + break; + case RIGHT_JUSTIFIED: + direction = -1.0; + factor = 1.0; + break; + case LEFT_JUSTIFIED: + default: + direction = 1.0; + factor = 1.0; + break; + } cairo_select_font_face (cr, g->font, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); cairo_set_font_size(cr, fontsize); cairo_text_extents(cr, text, &extents); - x = x - (extents.width / 2 + extents.x_bearing); + x = x + direction * (factor * extents.width + extents.x_bearing); y = y - (extents.height / 2 + extents.y_bearing); cairo_move_to(cr, x, y); cairo_show_text(cr, text); } +static inline void draw_centered_text(struct graph *g, cairo_t *cr, double x, double y, + double fontsize, const char *text) +{ + draw_aligned_text(g, cr, x, y, fontsize, text, CENTERED); +} + +static inline void draw_right_justified_text(struct graph *g, cairo_t *cr, + double x, double y, + double fontsize, const char *text) +{ + draw_aligned_text(g, cr, x, y, fontsize, text, RIGHT_JUSTIFIED); +} + +static inline void draw_left_justified_text(struct graph *g, cairo_t *cr, + double x, double y, + double fontsize, const char *text) +{ + draw_aligned_text(g, cr, x, y, fontsize, text, LEFT_JUSTIFIED); +} + static void draw_vertical_centered_text(struct graph *g, cairo_t *cr, double x, double y, double fontsize, const char *text) @@ -233,11 +329,10 @@ 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); - /* for now just set margins at 10% of width. This is not very good. */ - *x1 = g->xdim / 10.0; - *x2 = 9.0 * *x1; - *y1 = g->ydim / 10.0; - *y2 = 9.0 * *y1; + *x1 = 0.10 * g->xdim; + *x2 = 0.95 * g->xdim; + *y1 = 0.10 * g->ydim; + *y2 = 0.90 * g->ydim; cairo_move_to(cr, *x1, *y1); cairo_line_to(cr, *x1, *y2); @@ -254,18 +349,34 @@ 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; - int i; + int i, power_of_ten; static double dash[] = { 1.0, 2.0 }; - nticks = calc_tickmarks(minx, maxx, nticks, &tm); + nticks = calc_tickmarks(minx, maxx, nticks, &tm, &power_of_ten, + 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); + g->xtick_one_val = tm[1].value; + } + + /* really tx < yx || tx > x2, but protect against rounding */ + if (x1 - tx > 0.01 || tx - x2 > 0.01) continue; /* Draw tick mark */ @@ -283,28 +394,54 @@ 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; - int i; + int i, power_of_ten; static double dash[] = { 2.0, 2.0 }; - nticks = calc_tickmarks(miny, maxy, nticks, &tm); + nticks = calc_tickmarks(miny, maxy, nticks, &tm, &power_of_ten, + 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); + g->ytick_one_val = tm[1].value; + } + + /* 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); @@ -319,10 +456,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_centered_text(g, cr, x1 - (x2 - x1) * 0.04, ty, 12.0, tm[i].string); + 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) @@ -334,12 +479,20 @@ void bar_graph_draw(struct graph *bg, cairo_t *cr) struct graph_label *lb; cairo_save(cr); + cairo_translate(cr, bg->xoffset, bg->yoffset); 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) { @@ -349,8 +502,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; @@ -386,10 +538,15 @@ static double find_xy_value(struct graph *g, xy_value_extractor getvalue, double double tmp, answer = 0.0; struct graph_label *i; struct graph_value *j; + int first = 1; for (i = g->labels; i; i = i->next) for (j = i->values; j; j = j->next) { tmp = getvalue(j); + if (first) { + first = 0; + answer = tmp; + } answer = cmp(tmp, answer); } return answer; @@ -398,39 +555,73 @@ static double find_xy_value(struct graph *g, xy_value_extractor getvalue, double void line_graph_draw(struct graph *g, cairo_t *cr) { double x1, y1, x2, y2; - double minx, miny, maxx, maxy; - double tx, ty; + double minx, miny, maxx, maxy, gminx, gminy, gmaxx, gmaxy; + double tx, ty, top_extra, bottom_extra, left_extra, right_extra; struct graph_label *i; struct graph_value *j; - int first = 1; + int good_data = 1, first = 1; cairo_save(cr); + cairo_translate(cr, g->xoffset, g->yoffset); graph_draw_common(g, cr, &x1, &y1, &x2, &y2); 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) { - draw_centered_text(g, cr, - x1 + (x2 - x1) / 2.0, - y1 + (y2 - y1) / 2.0, 20.0, "No good Data"); - return; + good_data = 0; + minx = 0.0; + miny = 0.0; + maxx = 10.0; + maxy = 100.0; } - graph_draw_x_ticks(g, cr, x1, y1, x2, y2, minx, maxx, 10); - graph_draw_y_ticks(g, cr, x1, y1, x2, y2, miny, maxy, 10); + top_extra = 0.0; + bottom_extra = 0.0; + left_extra = 0.0; + right_extra = 0.0; + + if (g->top_extra > 0.001) + top_extra = fabs(maxy - miny) * g->top_extra; + if (g->bottom_extra > 0.001) + bottom_extra = fabs(maxy - miny) * g->bottom_extra; + if (g->left_extra > 0.001) + left_extra = fabs(maxx - minx) * g->left_extra; + if (g->right_extra > 0.001) + right_extra = fabs(maxx - minx) * g->right_extra; + + gminx = minx - left_extra; + gmaxx = maxx + right_extra; + gminy = miny - bottom_extra; + gmaxy = maxy + top_extra; + + 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; cairo_set_line_width(cr, 1.5); for (i = g->labels; i; i = i->next) { 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) - minx) / (maxx - minx)) * (x2 - x1) + x1; - ty = y2 - ((gety(j) - miny) / (maxy - miny)) * (y2 - y1); + tx = ((getx(j) - gminx) / (gmaxx - gminx)) * (x2 - x1) + x1; + ty = y2 - ((gety(j) - gminy) / (gmaxy - gminy)) * (y2 - y1); if (first) { cairo_move_to(cr, tx, ty); first = 0; @@ -440,18 +631,14 @@ void line_graph_draw(struct graph *g, cairo_t *cr) } cairo_stroke(cr); } - cairo_restore(cr); -} -static void gfree(void *f) -{ - if (f) - free(f); +skip_data: + cairo_restore(cr); } static void setstring(char **str, const char *value) { - gfree(*str); + free(*str); *str = strdup(value); } @@ -497,30 +684,84 @@ 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 *g = i->parent; struct graph_value *x; x = malloc(sizeof(*x)); + memset(x, 0, sizeof(*x)); x->value = value; x->next = NULL; - if (!i->tail) { + if (!i->tail) i->values = x; - } else { + else i->tail->next = x; - } i->tail = x; i->value_count++; - if (i->parent->per_label_limit != -1 && - i->value_count > i->parent->per_label_limit) { - x = i->values; - i->values = i->values->next; - free(x->value); - free(x); - i->value_count--; + if (tooltip) { + double xval = getx(x); + double minx = xval - (g->xtick_one_val * TOOLTIP_DELTA); + double maxx = xval + (g->xtick_one_val * TOOLTIP_DELTA); + struct prio_tree_node *ret; + + /* + * use msec to avoid dropping too much precision when + * storing as an integer. + */ + minx = minx * 1000.0; + maxx = maxx * 1000.0; + + INIT_PRIO_TREE_NODE(&x->node); + x->node.start = minx; + x->node.last = maxx; + if (x->node.last == x->node.start) { + x->node.last += fabs(g->xtick_delta); + if (x->node.last == x->node.start) + x->node.last++; + } + + /* + * If ret != &x->node, we have an alias. Since the values + * should be identical, we can drop it + */ + ret = prio_tree_insert(&i->prio_tree, &x->node); + if (ret == &x->node) { + x->tooltip = strdup(tooltip); + i->tooltip_count++; + } + } + + if (g->per_label_limit != -1 && + i->value_count > g->per_label_limit) { + int to_drop = 1; + + /* + * If the limit was dynamically reduced, making us more + * than 1 entry ahead after adding this one, drop two + * entries. This will make us (eventually) reach the + * specified limit. + */ + if (i->value_count - g->per_label_limit >= 2) + to_drop = 2; + + 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--; + } } } @@ -535,12 +776,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; @@ -552,18 +793,24 @@ 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; } -static void graph_free_values(struct graph_value *values) +static void graph_free_values(struct graph_label *l, struct graph_value *values) { struct graph_value *i, *next; for (i = values; i; i = next) { next = i->next; - gfree(i->value); - gfree(i); + free(i->value); + if (i->tooltip) { + free(i->tooltip); + prio_tree_remove(&l->prio_tree, &i->node); + l->tooltip_count--; + } + free(i); } } @@ -573,8 +820,8 @@ 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); + graph_free_values(i, i->values); + free(i); } } @@ -598,7 +845,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) @@ -612,9 +859,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); } @@ -627,3 +874,104 @@ void line_graph_set_data_count_limit(struct graph *g, int per_label_limit) g->per_label_limit = per_label_limit; } +void graph_add_extra_space(struct graph *g, double left_percent, double right_percent, + double top_percent, double bottom_percent) +{ + g->left_extra = left_percent; + g->right_extra = right_percent; + g->top_extra = top_percent; + 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 maxy, miny; + + 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); + + x = x * 1000.0; + maxy = y + (g->ytick_one_val * TOOLTIP_DELTA); + miny = y - (g->ytick_one_val * TOOLTIP_DELTA); + best_delta = UINT_MAX; + i = g->labels; + do { + INIT_PRIO_TREE_ITER(&iter); + prio_tree_iter_init(&iter, &i->prio_tree, x, x); + + n = prio_tree_next(&iter); + if (!n) + continue; + + do { + struct graph_value *v; + double yval, ydiff; + + v = container_of(n, struct graph_value, node); + yval = gety(v); + ydiff = fabs(yval - y); + + /* + * zero delta, or within or match critera, break + */ + if (ydiff < best_delta) { + best_delta = ydiff; + if (!best_delta || + (yval >= miny && yval <= maxy)) { + 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; +}