X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=graph.c;h=55dde85e937fa4561c3895acc1318faccacb278d;hb=b7a69ad89e65cb4f38ccf164ae7c00bb4efe0ef5;hp=837211dacebdb4f47defcc6e5b02ce9149c0b25c;hpb=6a4cf74fc2521b601cb1cc9478526cc441830a5c;p=fio.git

diff --git a/graph.c b/graph.c
index 837211da..55dde85e 100644
--- a/graph.c
+++ b/graph.c
@@ -31,14 +31,21 @@
 
 #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;
 };
 
 struct graph_value {
 	struct graph_value *next;
+	struct prio_tree_node node;
 	char *tooltip;
 	void *value;
 };
@@ -48,12 +55,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;
@@ -71,6 +84,15 @@ struct graph {
 	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)
@@ -342,6 +364,17 @@ static void graph_draw_x_ticks(struct graph *g, cairo_t *cr,
 	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;
@@ -367,7 +400,6 @@ static void graph_draw_x_ticks(struct graph *g, cairo_t *cr,
 		/* draw tickmark label */
 		draw_centered_text(g, cr, tx, y2 * 1.04, 12.0, tm[i].string);
 		cairo_stroke(cr);
-		
 	}
 }
 
@@ -395,6 +427,17 @@ static double graph_draw_y_ticks(struct graph *g, cairo_t *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;
@@ -574,10 +617,9 @@ 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) {
-			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) {
@@ -586,26 +628,17 @@ void line_graph_draw(struct graph *g, cairo_t *cr)
 			} 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);
 }
 
@@ -651,32 +684,62 @@ 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,
 				  const char *tooltip)
 {
+	struct graph *g = i->parent;
 	struct graph_value *x;
 
 	x = malloc(sizeof(*x));
+	memset(x, 0, sizeof(*x));
 	x->value = value;
-	if (tooltip)
-		x->tooltip = strdup(tooltip);
-	else
-		x->tooltip = NULL;
 	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 (x->tooltip)
-		i->tooltip_count++;
 
-	if (i->parent->per_label_limit != -1 &&
-		i->value_count > i->parent->per_label_limit) {
+	if (tooltip) {
+		/*
+		 * use msec to avoid dropping too much precision when
+		 * storing as an integer.
+		 */
+		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;
+
+		xval = xval * 1000.0;
+		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;
 
 		/*
@@ -685,7 +748,7 @@ static void graph_label_add_value(struct graph_label *i, void *value,
 		 * 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--) {
@@ -693,6 +756,7 @@ static void graph_label_add_value(struct graph_label *i, void *value,
 			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);
@@ -735,14 +799,19 @@ int graph_add_xy_data(struct graph *bg, const char *label,
 	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);
 	}	
 }
 
@@ -752,8 +821,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);
 	}	
 }
 
@@ -777,7 +846,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)
@@ -791,9 +860,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);
 }
 
@@ -846,27 +915,64 @@ int graph_contains_xy(struct graph *g, int x, int y)
 	return (x >= first_x && x <= last_x) && (y >= first_y && y <= last_y);
 }
 
-static int xy_match(struct xyvalue *xy, int x, int y)
-{
-	int xdiff = abs(xy->gx - x);
-	int ydiff = abs(xy->gy - y);
-
-	return xdiff <= 10 && ydiff <= 10;
-}
-
-const char *graph_find_tooltip(struct graph *g, int x, int 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 *j;
+	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;
 
-	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;
+			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 (xy_match(xy, x - g->xoffset, y))
-				return j->tooltip;
-		}
-	}
+		/*
+		 * If we got matches in one label, don't check others.
+		 */
+		break;
+	} while ((i = i->next) != NULL);
+
+	if (best)
+		return best->tooltip;
 
 	return NULL;
 }