Skip to content

Commit 964a0b3

Browse files
Arjan van de VenIngo Molnar
Arjan van de Ven
authored and
Ingo Molnar
committed
perf utils: Be consistent about minimum text size in the svghelper
Be more consistent in the svghelper about the minimum text size by having a global #define for this. There needs to be a minimum text size in order to keep the size of the SVG file within the reach of what current SVG viewers can cope with. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Cc: fweisbec@gmail.com Cc: peterz@infradead.org Cc: Paul Mackerras <paulus@samba.org> Cc: Arjan van de Ven <arjan@infradead.org> LKML-Reference: <20090919133507.7374ef8b@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
1 parent 3c09eeb commit 964a0b3

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

‎tools/perf/util/svghelper.c

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ static u64 turbo_frequency, max_freq;
2727
#define SLOT_HEIGHT 25.0
2828
#define WIDTH 1000.0
2929

30+
#define MIN_TEXT_SIZE 0.001
31+
3032
static u64 total_height;
3133
static FILE *svgfile;
3234

@@ -104,8 +106,8 @@ void svg_sample(int Yslot, int cpu, u64 start, u64 end, const char *type)
104106
text_size = text_size/2;
105107
if (text_size > 1.25)
106108
text_size = 1.25;
107-
if (text_size > 0.0001)
108-
fprintf(svgfile, "<text transform=\"translate(%1.6f,%1.6f)\" font-size=\"%1.6fpt\">%i</text>\n",
109+
if (text_size > MIN_TEXT_SIZE)
110+
fprintf(svgfile, "<text transform=\"translate(%1.8f,%1.8f)\" font-size=\"%1.6fpt\">%i</text>\n",
109111
time2pixels(start), Yslot * SLOT_MULT + SLOT_HEIGHT - 1, text_size, cpu + 1);
110112

111113
}
@@ -146,10 +148,10 @@ void svg_cpu_box(int cpu, u64 __max_freq, u64 __turbo_freq)
146148
cpu2y(cpu), SLOT_MULT+SLOT_HEIGHT);
147149

148150
sprintf(cpu_string, "CPU %i", (int)cpu+1);
149-
fprintf(svgfile, "<text transform=\"translate(%4.1f,%4.1f)\">%s</text>\n",
151+
fprintf(svgfile, "<text transform=\"translate(%4.8f,%4.8f)\">%s</text>\n",
150152
10+time2pixels(first_time), cpu2y(cpu) + SLOT_HEIGHT/2, cpu_string);
151153

152-
fprintf(svgfile, "<text transform=\"translate(%4.1f,%4.1f)\" font-size=\"1.25pt\">%s</text>\n",
154+
fprintf(svgfile, "<text transform=\"translate(%4.8f,%4.8f)\" font-size=\"1.25pt\">%s</text>\n",
153155
10+time2pixels(first_time), cpu2y(cpu) + SLOT_MULT + SLOT_HEIGHT - 4, cpu_model());
154156
}
155157

@@ -166,8 +168,8 @@ void svg_process(int cpu, u64 start, u64 end, const char *type, const char *name
166168
if (width > 6)
167169
width = 6;
168170

169-
if (width > 0.001)
170-
fprintf(svgfile, "<text transform=\"translate(%4.5f,%4.5f) rotate(90)\" font-size=\"%3.4fpt\">%s</text>\n",
171+
if (width > MIN_TEXT_SIZE)
172+
fprintf(svgfile, "<text transform=\"translate(%4.8f,%4.8f) rotate(90)\" font-size=\"%3.4fpt\">%s</text>\n",
171173
time2pixels(start), cpu2y(cpu), width, name);
172174
}
173175

@@ -193,8 +195,8 @@ void svg_cstate(int cpu, u64 start, u64 end, int type)
193195
if (width > 6)
194196
width = 6;
195197

196-
if (width > 0.05)
197-
fprintf(svgfile, "<text transform=\"translate(%4.5f,%4.5f) rotate(90)\" font-size=\"%3.4fpt\">C%i</text>\n",
198+
if (width > MIN_TEXT_SIZE)
199+
fprintf(svgfile, "<text transform=\"translate(%4.8f,%4.8f) rotate(90)\" font-size=\"%3.4fpt\">C%i</text>\n",
198200
time2pixels(start), cpu2y(cpu), width, type);
199201
}
200202

@@ -234,7 +236,7 @@ void svg_pstate(int cpu, u64 start, u64 end, u64 freq)
234236
height = 1 + cpu2y(cpu) + SLOT_MULT + SLOT_HEIGHT - height;
235237
fprintf(svgfile, "<line x1=\"%4.8f\" x2=\"%4.8f\" y1=\"%4.1f\" y2=\"%4.1f\" class=\"pstate\"/>\n",
236238
time2pixels(start), time2pixels(end), height, height);
237-
fprintf(svgfile, "<text transform=\"translate(%4.1f,%4.1f)\" font-size=\"0.25pt\">%s</text>\n",
239+
fprintf(svgfile, "<text transform=\"translate(%4.8f,%4.8f)\" font-size=\"0.25pt\">%s</text>\n",
238240
time2pixels(start), height+0.9, HzToHuman(freq));
239241

240242
}
@@ -311,7 +313,7 @@ void svg_text(int Yslot, u64 start, const char *text)
311313
if (!svgfile)
312314
return;
313315

314-
fprintf(svgfile, "<text transform=\"translate(%4.1f,%4.1f)\">%s</text>\n",
316+
fprintf(svgfile, "<text transform=\"translate(%4.8f,%4.8f)\">%s</text>\n",
315317
time2pixels(start), Yslot * SLOT_MULT+SLOT_HEIGHT/2, text);
316318
}
317319

@@ -322,7 +324,7 @@ static void svg_legenda_box(int X, const char *text, const char *style)
322324

323325
fprintf(svgfile, "<rect x=\"%i\" width=\"%4.8f\" y=\"0\" height=\"%4.1f\" class=\"%s\"/>\n",
324326
X, boxsize, boxsize, style);
325-
fprintf(svgfile, "<text transform=\"translate(%4.1f, %4.1f)\" font-size=\"%4.4fpt\">%s</text>\n",
327+
fprintf(svgfile, "<text transform=\"translate(%4.8f, %4.8f)\" font-size=\"%4.4fpt\">%s</text>\n",
326328
X + boxsize + 5, boxsize, 0.8 * boxsize, text);
327329
}
328330

0 commit comments

Comments
 (0)