#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;
- int gx, gy;
+};
+
+enum {
+ GV_F_ON_PRIO = 1,
+ GV_F_PRIO_SKIP = 2,
};
struct graph_value {
- struct graph_value *next;
+ struct flist_head list;
+ struct prio_tree_node node;
+ struct flist_head alias;
+ unsigned int flags;
char *tooltip;
void *value;
};
struct graph_label {
+ struct flist_head list;
char *label;
- struct graph_value *tail;
- struct graph_value *values;
- struct graph_label *next;
+ struct flist_head value_list;
+ struct prio_tree_root prio_tree;
double r, g, b;
+ int hide;
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;
+ struct flist_head label_list;
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;
+ unsigned int dont_graph_all_zeroes;
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)
struct graph *g;
g = calloc(1, sizeof(*g));
+ INIT_FLIST_HEAD(&g->label_list);
graph_set_size(g, xdim, ydim);
g->per_label_limit = -1;
g->font = font;
g->y_axis_unit_change_callback = f;
}
-static int count_labels(struct graph_label *labels)
+static int count_labels(struct graph *g)
{
+ struct flist_head *entry;
int count = 0;
- struct graph_label *i;
- for (i = labels; i; i = i->next)
+ flist_for_each(entry, &g->label_list)
count++;
+
return count;
}
-static int count_values(struct graph_value *values)
+static int count_values(struct graph_label *l)
{
+ struct flist_head *entry;
int count = 0;
- struct graph_value *i;
- for (i = values; i; i = i->next)
+ flist_for_each(entry, &l->value_list)
count++;
+
return count;
}
return a < b ? b : a;
}
-static double find_double_values(struct graph_value *values, double_comparator cmp)
+static double find_double_values(struct graph_label *l, double_comparator cmp)
{
- struct graph_value *i;
- int first = 1;
+ struct flist_head *entry;
double answer, tmp;
+ int first = 1;
+
+ if (flist_empty(&l->value_list))
+ return 0.0;
- assert(values != NULL);
- answer = 0.0; /* shut the compiler up, might need to think harder though. */
- for (i = values; i; i = i->next) {
- tmp = *(double *) i->value;
+ flist_for_each(entry, &l->value_list) {
+ struct graph_value *i;
+
+ i = flist_entry(entry, struct graph_value, list);
+ tmp = *(double *) i->value;
if (first) {
answer = tmp;
first = 0;
return answer;
}
-static double find_double_data(struct graph_label *labels, double_comparator cmp)
+static double find_double_data(struct graph *g, double_comparator cmp)
{
+ struct flist_head *entry;
struct graph_label *i;
int first = 1;
double answer, tmp;
- assert(labels != NULL);
- answer = 0.0; /* shut the compiler up, might need to think harder though. */
- for (i = labels; i; i = i->next) {
- tmp = find_double_values(i->values, cmp);
+ if (flist_empty(&g->label_list))
+ return 0.0;
+
+ flist_for_each(entry, &g->label_list) {
+ i = flist_entry(entry, struct graph_label, list);
+ tmp = find_double_values(i, cmp);
if (first) {
answer = tmp;
first = 0;
return answer;
}
-static double find_min_data(struct graph_label *labels)
+static double find_min_data(struct graph *g)
{
- return find_double_data(labels, mindouble);
+ return find_double_data(g, mindouble);
}
-static double find_max_data(struct graph_label *labels)
+static double find_max_data(struct graph *g)
{
- return find_double_data(labels, maxdouble);
+ return find_double_data(g, maxdouble);
}
static void draw_bars(struct graph *bg, cairo_t *cr, struct graph_label *lb,
double label_offset, double bar_width,
double mindata, double maxdata)
{
- struct graph_value *i;
+ struct flist_head *entry;
double x1, y1, x2, y2;
int bar_num = 0;
double domain, range, v;
domain = (maxdata - mindata);
range = (double) bg->ydim * 0.80; /* FIXME */
cairo_stroke(cr);
- for (i = lb->values; i; i = i->next) {
+ flist_for_each(entry, &lb->value_list) {
+ struct graph_value *i;
+
+ i = flist_entry(entry, struct graph_value, list);
x1 = label_offset + (double) bar_num * bar_width + (bar_width * 0.05);
x2 = x1 + bar_width * 0.90;
static void graph_draw_common(struct graph *g, cairo_t *cr,
double *x1, double *y1, double *x2, double *y2)
{
- cairo_set_source_rgb(cr, 0, 0, 0);
- cairo_set_line_width (cr, 0.8);
+ 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;
for (i = 0; i < nticks; i++) {
tx = (((tm[i].value) - minx) / (maxx - minx)) * (x2 - x1) + x1;
+ /*
+ * 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 tickmark label */
draw_centered_text(g, cr, tx, y2 * 1.04, 12.0, tm[i].string);
cairo_stroke(cr);
-
}
}
for (i = 0; i < nticks; i++) {
ty = y2 - (((tm[i].value) - miny) / (maxy - miny)) * (y2 - y1);
+ /*
+ * 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;
double label_offset, mindata, maxdata;
int i, nlabels;
struct graph_label *lb;
+ struct flist_head *entry;
cairo_save(cr);
cairo_translate(cr, bg->xoffset, bg->yoffset);
graph_draw_common(bg, cr, &x1, &y1, &x2, &y2);
- nlabels = count_labels(bg->labels);
+ nlabels = count_labels(bg);
space_per_label = (x2 - x1) / (double) nlabels;
- mindata = find_min_data(bg->labels);
- maxdata = find_max_data(bg->labels);
+ /*
+ * 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);
+ if (mindata > 0)
+ mindata = 0;
+
+ maxdata = find_max_data(bg);
if (fabs(maxdata - mindata) < 1e-20) {
draw_centered_text(bg, cr,
return;
}
- graph_draw_y_ticks(bg, cr, x1, y1, x2, y2, mindata, maxdata, 10, 1);
-
+ 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) {
+ flist_for_each(entry, &bg->label_list) {
int nvalues;
- nvalues = count_values(lb->values);
+
+ lb = flist_entry(entry, struct graph_label, list);
+ nvalues = count_values(lb);
bar_width = (space_per_label - space_per_label * 0.2) / (double) nvalues;
label_offset = bg->xdim * 0.1 + space_per_label * (double) i + space_per_label * 0.1;
draw_bars(bg, cr, lb, label_offset, bar_width, mindata, maxdata);
double tmp, answer = 0.0;
struct graph_label *i;
struct graph_value *j;
+ struct flist_head *jentry, *entry;
int first = 1;
- for (i = g->labels; i; i = i->next)
- for (j = i->values; j; j = j->next) {
+ flist_for_each(entry, &g->label_list) {
+ i = flist_entry(entry, struct graph_label, list);
+
+ flist_for_each(jentry, &i->value_list) {
+ j = flist_entry(jentry, struct graph_value, list);
tmp = getvalue(j);
if (first) {
first = 0;
}
answer = cmp(tmp, answer);
}
+ }
+
return answer;
-}
+}
void line_graph_draw(struct graph *g, cairo_t *cr)
{
struct graph_label *i;
struct graph_value *j;
int good_data = 1, first = 1;
+ struct flist_head *entry, *lentry;
cairo_save(cr);
cairo_translate(cr, g->xoffset, g->yoffset);
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) {
goto skip_data;
cairo_set_line_width(cr, 1.5);
- for (i = g->labels; i; i = i->next) {
+ flist_for_each(lentry, &g->label_list) {
+ i = flist_entry(lentry, struct graph_label, list);
first = 1;
- if (i->r < 0) /* invisible data */
+ if (i->hide || 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;
+ cairo_set_source_rgb(cr, i->r, i->g, i->b);
+ flist_for_each(entry, &i->value_list) {
+ j = flist_entry(entry, struct graph_value, list);
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);
}
skip_data:
cairo_restore(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);
}
static struct graph_label *graph_find_label(struct graph *bg,
const char *label)
{
+ struct flist_head *entry;
struct graph_label *i;
- for (i = bg->labels; i; i = i->next)
+ flist_for_each(entry, &bg->label_list) {
+ i = flist_entry(entry, struct graph_label, list);
+
if (strcmp(label, i->label) == 0)
return i;
+ }
+
return NULL;
}
-void graph_add_label(struct graph *bg, const char *label)
+graph_label_t graph_add_label(struct graph *bg, const char *label)
{
struct graph_label *i;
i = graph_find_label(bg, label);
if (i)
- return; /* already present. */
+ return i; /* already present. */
i = calloc(1, sizeof(*i));
+ INIT_FLIST_HEAD(&i->value_list);
i->parent = bg;
setstring(&i->label, label);
- i->next = NULL;
- if (!bg->tail)
- bg->labels = i;
- else
- bg->tail->next = i;
- bg->tail = i;
+ flist_add_tail(&i->list, &bg->label_list);
+ INIT_PRIO_TREE_ROOT(&i->prio_tree);
+ return i;
+}
+
+static void __graph_value_drop(struct graph_label *l, struct graph_value *v)
+{
+ flist_del_init(&v->list);
+ if (v->tooltip)
+ free(v->tooltip);
+ free(v->value);
+ free(v);
+ l->value_count--;
+}
+
+static void graph_value_drop(struct graph_label *l, struct graph_value *v)
+{
+ if (v->flags & GV_F_PRIO_SKIP) {
+ __graph_value_drop(l, v);
+ return;
+ }
+
+ /*
+ * Find head, the guy that's on the prio tree
+ */
+ while (!(v->flags & GV_F_ON_PRIO)) {
+ assert(!flist_empty(&v->alias));
+ v = flist_entry(v->alias.next, struct graph_value, alias);
+ }
+
+ prio_tree_remove(&l->prio_tree, &v->node);
+
+ /*
+ * Free aliases
+ */
+ while (!flist_empty(&v->alias)) {
+ struct graph_value *a;
+
+ a = flist_entry(v->alias.next, struct graph_value, alias);
+ flist_del_init(&a->alias);
+
+ __graph_value_drop(l, a);
+ }
+
+ __graph_value_drop(l, v);
}
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));
+ INIT_FLIST_HEAD(&x->alias);
+ INIT_FLIST_HEAD(&x->list);
+ flist_add_tail(&x->list, &i->value_list);
+ i->value_count++;
x->value = value;
- if (tooltip)
+
+ 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;
x->tooltip = strdup(tooltip);
- else
- x->tooltip = NULL;
- x->next = NULL;
- if (!i->tail) {
- i->values = x;
- } else {
- i->tail->next = x;
- }
- i->tail = x;
- i->value_count++;
- if (x->tooltip)
- i->tooltip_count++;
+ 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 (i->parent->per_label_limit != -1 &&
- i->value_count > i->parent->per_label_limit) {
+ /*
+ * 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) {
+ struct graph_value *alias;
+
+ alias = container_of(ret, struct graph_value, node);
+ flist_add_tail(&x->alias, &alias->alias);
+ } else
+ x->flags = GV_F_ON_PRIO;
+ } else
+ x->flags = GV_F_PRIO_SKIP;
+
+ if (g->per_label_limit != -1 &&
+ i->value_count > g->per_label_limit) {
int to_drop = 1;
/*
* entries. This will make us (eventually) reach the
* specified limit.
*/
- if (i->value_count - i->parent->per_label_limit >= 2)
+ 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);
- i->tooltip_count--;
- }
- free(x->value);
- free(x);
- i->value_count--;
+ while (to_drop-- && !flist_empty(&i->value_list)) {
+ x = flist_entry(i->value_list.next, struct graph_value, list);
+ graph_value_drop(i, x);
+
+ /*
+ * If we have aliases, we could drop > 1 above.
+ */
+ if (i->value_count <= g->per_label_limit)
+ break;
}
}
}
-int graph_add_data(struct graph *bg, const char *label, const double value)
+int graph_add_data(struct graph *bg, graph_label_t label, const double value)
{
- struct graph_label *i;
+ struct graph_label *i = label;
double *d;
d = malloc(sizeof(*d));
*d = value;
- i = graph_find_label(bg, label);
- if (!i)
- return -1;
graph_label_add_value(i, d, NULL);
return 0;
}
-int graph_add_xy_data(struct graph *bg, const char *label,
+static int graph_nonzero_y(struct graph_label *l)
+{
+ struct flist_head *entry;
+
+ flist_for_each(entry, &l->value_list) {
+ struct graph_value *v;
+
+ v = flist_entry(entry, struct graph_value, list);
+ if (gety(v) != 0.0)
+ return 1;
+ }
+
+ return 0;
+}
+
+int graph_add_xy_data(struct graph *bg, graph_label_t label,
const double x, const double y, const char *tooltip)
{
- struct graph_label *i;
+ struct graph_label *i = label;
struct xyvalue *xy;
+ if (bg->dont_graph_all_zeroes && y == 0.0 && !graph_nonzero_y(i))
+ i->hide = 1;
+ else
+ i->hide = 0;
+
xy = malloc(sizeof(*xy));
xy->x = x;
xy->y = y;
- i = graph_find_label(bg, label);
- if (!i)
- return -1;
-
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 *i, *next;
+ struct graph_value *i;
- for (i = values; i; i = next) {
- next = i->next;
- gfree(i->value);
- gfree(i);
+ while (!flist_empty(&l->value_list)) {
+ i = flist_entry(l->value_list.next, struct graph_value, list);
+ graph_value_drop(l, i);
}
}
-static void graph_free_labels(struct graph_label *labels)
+static void graph_free_labels(struct graph *g)
{
- struct graph_label *i, *next;
+ struct graph_label *i;
- for (i = labels; i; i = next) {
- next = i->next;
- graph_free_values(i->values);
- gfree(i);
+ while (!flist_empty(&g->label_list)) {
+ i = flist_entry(g->label_list.next, struct graph_label, list);
+ flist_del(&i->list);
+ graph_free_values(i);
+ free(i);
}
}
-void graph_set_color(struct graph *gr, const char *label,
- double red, double green, double blue)
+void graph_set_color(struct graph *gr, graph_label_t label, double red,
+ double green, double blue)
{
- struct graph_label *i;
+ struct graph_label *i = label;
double r, g, b;
if (red < 0.0) { /* invisible color */
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)
- if (strcmp(i->label, label) == 0) {
- i->r = r;
- i->g = g;
- i->b = b;
- break;
- }
+ i->r = r;
+ i->g = g;
+ i->b = b;
}
void graph_free(struct graph *bg)
{
- gfree(bg->title);
- gfree(bg->xtitle);
- gfree(bg->ytitle);
- graph_free_labels(bg->labels);
+ free(bg->title);
+ free(bg->xtitle);
+ free(bg->ytitle);
+ graph_free_labels(bg);
}
/* For each line in the line graph, up to per_label_limit segments may
int graph_has_tooltips(struct graph *g)
{
+ struct flist_head *entry;
struct graph_label *i;
- for (i = g->labels; i; i = i->next)
- if (i->tooltip_count)
+ flist_for_each(entry, &g->label_list) {
+ i = flist_entry(entry, struct graph_label, list);
+
+ if (!prio_tree_empty(&i->prio_tree))
return 1;
+ }
return 0;
}
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_value *best = NULL;
+ struct flist_head *entry;
+ 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;
+ flist_for_each(entry, &g->label_list) {
+ struct graph_label *i;
+
+ i = flist_entry(entry, struct graph_label, list);
+ if (i->hide)
+ continue;
- return xdiff <= 20 && ydiff <= 10;
-}
+ INIT_PRIO_TREE_ITER(&iter);
+ prio_tree_iter_init(&iter, &i->prio_tree, x, x);
-const char *graph_find_tooltip(struct graph *g, int x, int y)
-{
- struct graph_label *i;
- struct graph_value *j;
+ n = prio_tree_next(&iter);
+ if (!n)
+ continue;
- for (i = g->labels; i; i = i->next) {
- for (j = i->values; j; j = j->next) {
- struct xyvalue *xy = j->value;
+ do {
+ struct graph_value *v, *rootv;
+ double yval, ydiff;
+
+ v = container_of(n, struct graph_value, node);
+ rootv = v;
+ do {
+ 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;
+ }
+ }
+ if (!flist_empty(&v->alias))
+ v = flist_entry(v->alias.next, struct graph_value, alias);
+ } while (v != rootv);
+ } while ((n = prio_tree_next(&iter)) != NULL);
- if (xy_match(xy, x - g->xoffset, y))
- return j->tooltip;
- }
+ /*
+ * If we got matches in one label, don't check others.
+ */
+ if (best)
+ break;
}
+ if (best)
+ return best->tooltip;
+
return NULL;
}
+
+void graph_set_graph_all_zeroes(struct graph *g, unsigned int set)
+{
+ g->dont_graph_all_zeroes = !set;
+}
projects / fio.git / blobdiff