From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: openembedded-core <openembedded-core@lists.openembedded.org>
Subject: [PATCH] scripts/pybootchart: Fix missing entries bug
Date: Mon, 19 Nov 2012 15:02:18 +0000 [thread overview]
Message-ID: <1353337338.3709.168.camel@ted> (raw)
If two entries have the same start time, the data store used will cause
all but one of the entries to be lost. This patch enhances the data
storage structure to avoid this problem and allow more than one
event to start at the same time.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/scripts/pybootchartgui/pybootchartgui/draw.py b/scripts/pybootchartgui/pybootchartgui/draw.py
index 16830fa..1b872de 100644
--- a/scripts/pybootchartgui/pybootchartgui/draw.py
+++ b/scripts/pybootchartgui/pybootchartgui/draw.py
@@ -287,32 +287,33 @@ def render(ctx, res):
offset = min(res.start.keys())
for s in sorted(res.start.keys()):
- task = res.start[s].split(":")[1]
- #print res.start[s]
- #print res.processes[res.start[s]][1]
- #print s
- x = (s - offset) * sec_w
- w = ((res.processes[res.start[s]][1] - s) * sec_w)
-
- #print "proc at %s %s %s %s" % (x, y, w, proc_h)
- col = None
- if task == "do_compile":
- col = TASK_COLOR_COMPILE
- elif task == "do_configure":
- col = TASK_COLOR_CONFIGURE
- elif task == "do_install":
- col = TASK_COLOR_INSTALL
- elif task == "do_package":
- col = TASK_COLOR_PACKAGE
- elif task == "do_populate_sysroot":
- col = TASK_COLOR_SYSROOT
-
- draw_rect(ctx, PROC_BORDER_COLOR, (x, y, w, proc_h))
- if col:
- draw_fill_rect(ctx, col, (x, y, w, proc_h))
-
- draw_label_in_box(ctx, PROC_TEXT_COLOR, res.start[s], x, y + proc_h - 4, w, proc_h)
- y = y + proc_h
+ for val in sorted(res.start[s]):
+ task = val.split(":")[1]
+ #print val
+ #print res.processes[val][1]
+ #print s
+ x = (s - offset) * sec_w
+ w = ((res.processes[val][1] - s) * sec_w)
+
+ #print "proc at %s %s %s %s" % (x, y, w, proc_h)
+ col = None
+ if task == "do_compile":
+ col = TASK_COLOR_COMPILE
+ elif task == "do_configure":
+ col = TASK_COLOR_CONFIGURE
+ elif task == "do_install":
+ col = TASK_COLOR_INSTALL
+ elif task == "do_package":
+ col = TASK_COLOR_PACKAGE
+ elif task == "do_populate_sysroot":
+ col = TASK_COLOR_SYSROOT
+
+ draw_rect(ctx, PROC_BORDER_COLOR, (x, y, w, proc_h))
+ if col:
+ draw_fill_rect(ctx, col, (x, y, w, proc_h))
+
+ draw_label_in_box(ctx, PROC_TEXT_COLOR, val, x, y + proc_h - 4, w, proc_h)
+ y = y + proc_h
# draw process boxes
#draw_process_bar_chart(ctx, proc_tree, curr_y + bar_h, w, h)
diff --git a/scripts/pybootchartgui/pybootchartgui/parsing.py b/scripts/pybootchartgui/pybootchartgui/parsing.py
index c64eba0..a0f6e8e 100644
--- a/scripts/pybootchartgui/pybootchartgui/parsing.py
+++ b/scripts/pybootchartgui/pybootchartgui/parsing.py
@@ -184,9 +184,16 @@ def _do_parse(state, filename, file):
elif line.startswith("Ended:"):
end = int(float(line.split()[-1]))
if start and end and (end - start) > 8:
+ k = pn + ":" + task
state.processes[pn + ":" + task] = [start, end]
- state.start[start] = pn + ":" + task
- state.end[end] = pn + ":" + task
+ if start not in state.start:
+ state.start[start] = []
+ if k not in state.start[start]:
+ state.start[start].append(pn + ":" + task)
+ if end not in state.end:
+ state.end[end] = []
+ if k not in state.end[end]:
+ state.end[end].append(pn + ":" + task)
return state
def parse_file(state, filename):
@@ -248,12 +255,18 @@ def split_res(res, n):
#state.processes[pn + ":" + task] = [start, end]
#state.start[start] = pn + ":" + task
#state.end[end] = pn + ":" + task
- p = res.start[s_list[i]]
- s = s_list[i]
- e = res.processes[p][1]
- state.processes[p] = [s, e]
- state.start[s] = p
- state.end[e] = p
+ for p in res.start[s_list[i]]:
+ s = s_list[i]
+ e = res.processes[p][1]
+ state.processes[p] = [s, e]
+ if s not in state.start:
+ state.start[s] = []
+ if p not in state.start[s]:
+ state.start[s].append(p)
+ if e not in state.end:
+ state.end[e] = []
+ if p not in state.end[e]:
+ state.end[e].append(p)
start = end
end = end + frag_size
if end > len(s_list):
reply other threads:[~2012-11-19 15:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1353337338.3709.168.camel@ted \
--to=richard.purdie@linuxfoundation.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox