pybootchartgui: write the max values in the graph legend

* easier to find than searching for the highest value in the graph, when the graph is really wide

(From OE-Core rev: 615e04554aa8442d89ea186b30f23adeb1e64762)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa 2022-08-03 17:12:30 +02:00 committed by Richard Purdie
parent 15c7fc3174
commit 7f4555e35f

View File

@ -433,8 +433,10 @@ def render_charts(ctx, options, clip, trace, curr_y, w, h, sec_w):
# render CPU pressure chart # render CPU pressure chart
if trace.cpu_pressure: if trace.cpu_pressure:
draw_legend_line(ctx, "avg10 CPU Pressure", CPU_PRESSURE_AVG10_COLOR, off_x, curr_y+20, leg_s) max_sample_avg = max (trace.cpu_pressure, key = lambda s: s.avg10)
draw_legend_box(ctx, "delta total CPU Pressure", CPU_PRESSURE_TOTAL_COLOR, off_x + 140, curr_y+20, leg_s) max_sample_total = max (trace.cpu_pressure, key = lambda s: s.deltaTotal)
draw_legend_line(ctx, "avg10 CPU Pressure (max %d%%)" % (max_sample_avg.avg10), CPU_PRESSURE_AVG10_COLOR, off_x, curr_y+20, leg_s)
draw_legend_box(ctx, "delta total CPU Pressure (max %d)" % (max_sample_total.deltaTotal), CPU_PRESSURE_TOTAL_COLOR, off_x + 240, curr_y+20, leg_s)
# render delta total cpu # render delta total cpu
chart_rect = (off_x, curr_y+30, w, bar_h) chart_rect = (off_x, curr_y+30, w, bar_h)
@ -446,28 +448,29 @@ def render_charts(ctx, options, clip, trace, curr_y, w, h, sec_w):
proc_tree, None) proc_tree, None)
# render avg10 cpu # render avg10 cpu
max_sample = max (trace.cpu_pressure, key = lambda s: s.avg10)
if clip_visible (clip, chart_rect): if clip_visible (clip, chart_rect):
draw_chart (ctx, CPU_PRESSURE_AVG10_COLOR, False, chart_rect, \ draw_chart (ctx, CPU_PRESSURE_AVG10_COLOR, False, chart_rect, \
[(sample.time, sample.avg10) for sample in trace.cpu_pressure], \ [(sample.time, sample.avg10) for sample in trace.cpu_pressure], \
proc_tree, None) proc_tree, None)
pos_x = off_x + ((max_sample.time - proc_tree.start_time) * w / proc_tree.duration) pos_x = off_x + ((max_sample_avg.time - proc_tree.start_time) * w / proc_tree.duration)
shift_x, shift_y = -20, 20 shift_x, shift_y = -20, 20
if (pos_x < off_x + 245): if (pos_x < off_x + 245):
shift_x, shift_y = 5, 40 shift_x, shift_y = 5, 40
label = "%d%%" % (max_sample.avg10) label = "%d%%" % (max_sample_avg.avg10)
draw_text (ctx, label, CPU_PRESSURE_AVG10_COLOR, pos_x + shift_x, curr_y + shift_y) draw_text (ctx, label, CPU_PRESSURE_AVG10_COLOR, pos_x + shift_x, curr_y + shift_y)
curr_y = curr_y + 30 + bar_h curr_y = curr_y + 30 + bar_h
# render I/O pressure chart # render I/O pressure chart
if trace.io_pressure: if trace.io_pressure:
draw_legend_line(ctx, "avg10 I/O Pressure", IO_PRESSURE_AVG10_COLOR, off_x, curr_y+20, leg_s) max_sample_avg = max (trace.io_pressure, key = lambda s: s.avg10)
draw_legend_box(ctx, "delta total I/O Pressure", IO_PRESSURE_TOTAL_COLOR, off_x + 140, curr_y+20, leg_s) max_sample_total = max (trace.io_pressure, key = lambda s: s.deltaTotal)
draw_legend_line(ctx, "avg10 I/O Pressure (max %d%%)" % (max_sample_avg.avg10), IO_PRESSURE_AVG10_COLOR, off_x, curr_y+20, leg_s)
draw_legend_box(ctx, "delta total I/O Pressure (max %d)" % (max_sample_total.deltaTotal), IO_PRESSURE_TOTAL_COLOR, off_x + 240, curr_y+20, leg_s)
# render delta total io # render delta total io
chart_rect = (off_x, curr_y+30, w, bar_h) chart_rect = (off_x, curr_y+30, w, bar_h)
@ -479,28 +482,29 @@ def render_charts(ctx, options, clip, trace, curr_y, w, h, sec_w):
proc_tree, None) proc_tree, None)
# render avg10 io # render avg10 io
max_sample = max (trace.io_pressure, key = lambda s: s.avg10)
if clip_visible (clip, chart_rect): if clip_visible (clip, chart_rect):
draw_chart (ctx, IO_PRESSURE_AVG10_COLOR, False, chart_rect, \ draw_chart (ctx, IO_PRESSURE_AVG10_COLOR, False, chart_rect, \
[(sample.time, sample.avg10) for sample in trace.io_pressure], \ [(sample.time, sample.avg10) for sample in trace.io_pressure], \
proc_tree, None) proc_tree, None)
pos_x = off_x + ((max_sample.time - proc_tree.start_time) * w / proc_tree.duration) pos_x = off_x + ((max_sample_avg.time - proc_tree.start_time) * w / proc_tree.duration)
shift_x, shift_y = -20, 20 shift_x, shift_y = -20, 20
if (pos_x < off_x + 245): if (pos_x < off_x + 245):
shift_x, shift_y = 5, 40 shift_x, shift_y = 5, 40
label = "%d%%" % (max_sample.avg10) label = "%d%%" % (max_sample_avg.avg10)
draw_text (ctx, label, IO_PRESSURE_AVG10_COLOR, pos_x + shift_x, curr_y + shift_y) draw_text (ctx, label, IO_PRESSURE_AVG10_COLOR, pos_x + shift_x, curr_y + shift_y)
curr_y = curr_y + 30 + bar_h curr_y = curr_y + 30 + bar_h
# render MEM pressure chart # render MEM pressure chart
if trace.mem_pressure: if trace.mem_pressure:
draw_legend_line(ctx, "avg10 MEM Pressure", MEM_PRESSURE_AVG10_COLOR, off_x, curr_y+20, leg_s) max_sample_avg = max (trace.mem_pressure, key = lambda s: s.avg10)
draw_legend_box(ctx, "delta total MEM Pressure", MEM_PRESSURE_TOTAL_COLOR, off_x + 140, curr_y+20, leg_s) max_sample_total = max (trace.mem_pressure, key = lambda s: s.deltaTotal)
draw_legend_line(ctx, "avg10 MEM Pressure (max %d%%)" % (max_sample_avg.avg10), MEM_PRESSURE_AVG10_COLOR, off_x, curr_y+20, leg_s)
draw_legend_box(ctx, "delta total MEM Pressure (max %d)" % (max_sample_total.deltaTotal), MEM_PRESSURE_TOTAL_COLOR, off_x + 240, curr_y+20, leg_s)
# render delta total mem # render delta total mem
chart_rect = (off_x, curr_y+30, w, bar_h) chart_rect = (off_x, curr_y+30, w, bar_h)
@ -512,20 +516,19 @@ def render_charts(ctx, options, clip, trace, curr_y, w, h, sec_w):
proc_tree, None) proc_tree, None)
# render avg10 mem # render avg10 mem
max_sample = max (trace.mem_pressure, key = lambda s: s.avg10)
if clip_visible (clip, chart_rect): if clip_visible (clip, chart_rect):
draw_chart (ctx, MEM_PRESSURE_AVG10_COLOR, False, chart_rect, \ draw_chart (ctx, MEM_PRESSURE_AVG10_COLOR, False, chart_rect, \
[(sample.time, sample.avg10) for sample in trace.mem_pressure], \ [(sample.time, sample.avg10) for sample in trace.mem_pressure], \
proc_tree, None) proc_tree, None)
pos_x = off_x + ((max_sample.time - proc_tree.start_time) * w / proc_tree.duration) pos_x = off_x + ((max_sample_avg.time - proc_tree.start_time) * w / proc_tree.duration)
shift_x, shift_y = -20, 20 shift_x, shift_y = -20, 20
if (pos_x < off_x + 245): if (pos_x < off_x + 245):
shift_x, shift_y = 5, 40 shift_x, shift_y = 5, 40
label = "%d%%" % (max_sample.avg10) label = "%d%%" % (max_sample_avg.avg10)
draw_text (ctx, label, MEM_PRESSURE_AVG10_COLOR, pos_x + shift_x, curr_y + shift_y) draw_text (ctx, label, MEM_PRESSURE_AVG10_COLOR, pos_x + shift_x, curr_y + shift_y)
curr_y = curr_y + 30 + bar_h curr_y = curr_y + 30 + bar_h