#include "tickmarks.h"
#include "graph.h"
+#include "flist.h"
+#include "lib/prio_tree.h"
+
+/*
+ * Allowable difference to show tooltip
+ */
+#define TOOLTIP_DELTA 1.02
struct xyvalue {
double x, y;
- int gx, gy;
};
struct graph_value {
struct graph_value *next;
+ struct prio_tree_node node;
char *tooltip;
void *value;
};
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;
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)
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;
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;
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 */
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;
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);
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)
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) {
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;
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) {
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;
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) {
- struct xyvalue *xy = j->value;
-
tx = ((getx(j) - gminx) / (gmaxx - gminx)) * (x2 - x1) + x1;
ty = y2 - ((gety(j) - gminy) / (gmaxy - gminy)) * (y2 - y1);
if (first) {
} else {
cairo_line_to(cr, tx, ty);
}
- xy->gx = tx;
- xy->gy = ty;
}
cairo_stroke(cr);
}
}
-static void gfree(void *f)
-{
- if (f)
- free(f);
-}
-
static void setstring(char **str, const char *value)
{
- gfree(*str);
+ free(*str);
*str = strdup(value);
}
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,
}
i->tail = x;
i->value_count++;
- if (x->tooltip)
+
+ 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);
i->tooltip_count++;
+ }
if (i->parent->per_label_limit != -1 &&
i->value_count > i->parent->per_label_limit) {
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);
for (i = values; i; i = next) {
next = i->next;
- gfree(i->value);
- gfree(i);
+ free(i->value);
+ free(i);
}
}
for (i = labels; i; i = next) {
next = i->next;
graph_free_values(i->values);
- gfree(i);
+ free(i);
}
}
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)
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);
}
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;
return (x >= first_x && x <= last_x) && (y >= first_y && y <= last_y);
}
-static int xy_match(struct xyvalue *xy, int x, int y)
+const char *graph_find_tooltip(struct graph *g, int ix, int iy)
{
- int xdiff = abs(xy->gx - x);
- int ydiff = abs(xy->gy - y);
+ 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;
- return xdiff <= 20 && ydiff <= 10;
-}
+ x -= g->xoffset;
+ y -= g->yoffset;
-const char *graph_find_tooltip(struct graph *g, int x, int y)
-{
- struct graph_label *i;
- struct graph_value *j;
+ x = g->xtick_zero_val + ((x - g->xtick_zero) * g->xtick_delta);
+ y = g->ytick_zero_val + ((y - g->ytick_zero) * g->ytick_delta);
- for (i = g->labels; i; i = i->next) {
- for (j = i->values; j; j = j->next) {
- struct xyvalue *xy = j->value;
+ 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);
- if (xy_match(xy, x - g->xoffset, y))
- return j->tooltip;
- }
- }
+ 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;
}
projects / fio.git / blobdiff