X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=graph.c;h=7304b009646c5288b3f7f92bc73989e3bd90fb16;hp=aba095ba746c5606600ce94dbe4b8ef7d5fa2b79;hb=29b88e05d7bd205420995a8de8b5349950f92096;hpb=93e2db2bdbedbd6954bb0e0632514cae659fc30e

diff --git a/graph.c b/graph.c
index aba095ba..7304b009 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	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;
 };
@@ -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;
@@ -66,10 +79,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)
@@ -306,7 +327,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;
@@ -326,7 +347,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;
@@ -334,13 +355,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 */
@@ -358,16 +390,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;
@@ -375,14 +409,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);
@@ -397,10 +450,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)
@@ -416,9 +477,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) {
@@ -428,8 +496,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;
@@ -495,6 +562,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) {
@@ -524,8 +600,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;
@@ -535,10 +611,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) {
@@ -547,8 +622,6 @@ 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);
 	}
@@ -558,15 +631,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);
 }
 
@@ -612,6 +679,7 @@ 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,
@@ -633,8 +701,20 @@ 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) {
@@ -654,6 +734,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);
@@ -702,8 +783,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);
 	}	
 }
 
@@ -714,7 +795,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);
 	}	
 }
 
@@ -738,7 +819,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)
@@ -752,9 +833,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);
 }
 
@@ -776,6 +857,16 @@ 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;
@@ -797,27 +888,66 @@ 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)
+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;
 }