X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=graph.c;h=7dbfd357bde0b0296501897a3096df8a0a6c9799;hp=de65055b99c1ffbb0dc00c88b805629c9bfd5bc9;hb=ef4ad58a0ebcfe44611b787ba18503f1c6db9247;hpb=7175d91deff20b1408450c231b2b445ea28f7f29

diff --git a/graph.c b/graph.c
index de65055b..7dbfd357 100644
--- a/graph.c
+++ b/graph.c
@@ -24,6 +24,7 @@
 #include <malloc.h>
 #include <math.h>
 #include <assert.h>
+#include <stdlib.h>
 
 #include <cairo.h>
 #include <gtk/gtk.h>
@@ -33,10 +34,12 @@
 
 struct xyvalue {
 	double x, y;
+	int gx, gy;
 };
 
 struct graph_value {
 	struct graph_value *next;
+	char *tooltip;
 	void *value;
 };
 
@@ -47,6 +50,7 @@ struct graph_label {
 	struct graph_label *next;
 	double r, g, b;
 	int value_count;
+	unsigned int tooltip_count;
 	struct graph *parent;
 };
 
@@ -55,12 +59,18 @@ struct graph {
 	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;	
 };
 
 void graph_set_size(struct graph *g, unsigned int xdim, unsigned int ydim)
@@ -69,6 +79,12 @@ void graph_set_size(struct graph *g, unsigned int xdim, unsigned int ydim)
 	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;
@@ -291,7 +307,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;
@@ -311,7 +327,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;
@@ -319,13 +335,15 @@ 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)
+
+		/* really tx < yx || tx > x2, but protect against rounding */
+		if (x1 - tx > 0.01 || tx - x2 > 0.01)
 			continue;
 
 		/* Draw tick mark */
@@ -343,6 +361,9 @@ 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);
@@ -350,9 +371,9 @@ static void graph_draw_x_ticks(struct graph *g, cairo_t *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;
@@ -360,14 +381,24 @@ 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)
+
+		/* 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);
@@ -382,10 +413,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)
@@ -397,12 +436,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) {
@@ -412,8 +459,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;
@@ -466,13 +512,14 @@ 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 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);
@@ -488,8 +535,27 @@ void line_graph_draw(struct graph *g, cairo_t *cr)
 		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;
@@ -501,14 +567,18 @@ void line_graph_draw(struct graph *g, cairo_t *cr)
 			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);
+			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) {
 				cairo_move_to(cr, tx, ty);
 				first = 0;
 			} else {
 				cairo_line_to(cr, tx, ty);
 			}
+			xy->gx = tx;
+			xy->gy = ty;
 		}
 		cairo_stroke(cr);
 	}
@@ -574,12 +644,17 @@ void graph_add_label(struct graph *bg, const char *label)
 	bg->tail = i;
 }
 
-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_value *x;
 
 	x = malloc(sizeof(*x));
 	x->value = value;
+	if (tooltip)
+		x->tooltip = strdup(tooltip);
+	else
+		x->tooltip = NULL;
 	x->next = NULL;
 	if (!i->tail) {
 		i->values = x;
@@ -588,14 +663,33 @@ static void graph_label_add_value(struct graph_label *i, void *value)
 	}
 	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) {
-		x = i->values;
-		i->values = i->values->next;
-		free(x->value);
-		free(x);
-		i->value_count--;
+		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 - i->parent->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--;
+		}
 	}
 }
 
@@ -610,12 +704,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;
@@ -627,7 +721,8 @@ 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;
 }
 
@@ -702,3 +797,67 @@ 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);
+}
+
+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)
+{
+	struct graph_label *i;
+	struct graph_value *j;
+
+	for (i = g->labels; i; i = i->next) {
+		for (j = i->values; j; j = j->next) {
+			struct xyvalue *xy = j->value;
+
+			if (xy_match(xy, x - g->xoffset, y))
+				return j->tooltip;
+		}
+	}
+
+	return NULL;
+}