Skip to contentSkip to conversation

pybootchartgui: make the build profiling in pictures

PATCH Applied Robert Yang 2 participants 7 messages Jun 6, 2012 – Jun 15, 2012

lore
Share & tools
lore
#0 lore raw

cover pybootchartgui: make the build profiling in pictures

Note: Removed the patch details for PATCH 1/5 and 2/5 since they are too
big(bigger than 2M) to send via email, please fetch the patch via the git repo

// Robert

The following changes since commit df8f55a919b3cc602ce1f1c51630c7edf6e36b55:

ltp: Add patch to correct failing build (2012-06-05 23:05:00 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib robert/chart
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/chart

Robert Yang (5):
pybootchartgui: add the original code
pybootchartgui: remove the original examples
pybootchartgui: make the build profiling in pictures
pybootchartgui: split the output chart into multiple ones
pybootchartgui: Fix the filename and add a default format

 scripts/pybootchartgui/AUTHORS                     |   11 +
 scripts/pybootchartgui/COPYING                     |  674 ++++++++++++++++++++
 scripts/pybootchartgui/README                      |   36 +
 scripts/pybootchartgui/pybootchartgui.py           |    7 +
 scripts/pybootchartgui/pybootchartgui/batch.py     |   23 +
 scripts/pybootchartgui/pybootchartgui/draw.py      |  408 ++++++++++++
 scripts/pybootchartgui/pybootchartgui/gui.py       |  273 ++++++++
 scripts/pybootchartgui/pybootchartgui/main.py      |   76 +++
 scripts/pybootchartgui/pybootchartgui/parsing.py   |  264 ++++++++
 .../pybootchartgui/pybootchartgui/process_tree.py  |  270 ++++++++
 scripts/pybootchartgui/pybootchartgui/samples.py   |   93 +++
 .../pybootchartgui/tests/parser_test.py            |   93 +++
 .../pybootchartgui/tests/process_tree_test.py      |   78 +++
 13 files changed, 2306 insertions(+), 0 deletions(-)
 create mode 100644 scripts/pybootchartgui/AUTHORS
 create mode 100644 scripts/pybootchartgui/COPYING
 create mode 100644 scripts/pybootchartgui/README
 create mode 100755 scripts/pybootchartgui/pybootchartgui.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/__init__.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/batch.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/draw.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/gui.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/main.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/parsing.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/process_tree.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/samples.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/tests/parser_test.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/tests/process_tree_test.py
#1 lore raw

PATCH 1/5 pybootchartgui: add the original code

This is from:
http://pybootchartgui.googlecode.com/files/pybootchartgui-r124.tar.gz

Will modify it to make the build profiling in pictures.

[YOCTO #2403]

---
 scripts/pybootchartgui/AUTHORS                     |   11 +
 scripts/pybootchartgui/COPYING                     |  674 ++
 scripts/pybootchartgui/README                      |   36 +
 .../examples/1/extract.proc_diskstats.log          |  141 +
 .../pybootchartgui/examples/1/extract.proc_ps.log  |  861 ++
 .../examples/1/extract.proc_stat.log               |  141 +
 .../examples/1/extract.processtree.1.log           |  861 ++
 .../examples/1/extract.processtree.2.log           |  861 ++
 .../examples/1/extract.processtree.3.log           |  861 ++
 .../examples/1/extract.processtree.3a.log          |  861 ++
 .../examples/1/extract.processtree.3b.log          |  200 +
 .../examples/1/extract.processtree.3c.log          |  200 +
 .../examples/1/extract.processtree.3d.log          |  108 +
 .../examples/1/extract.processtree.3e.log          |  100 +
 .../examples/1/extract.processtree.4.log           |  100 +
 .../examples/1/extract.processtree.5.log           |  100 +
 .../pybootchartgui/examples/1/extract2.proc_ps.log |  861 ++
 scripts/pybootchartgui/examples/1/header           |    7 +
 .../pybootchartgui/examples/1/java-png-result.png  |  Bin 0 -> 138999 bytes
 .../pybootchartgui/examples/1/proc_diskstats.log   | 3171 +++++++
 scripts/pybootchartgui/examples/1/proc_ps.log      | 9041 ++++++++++++++++++++
 scripts/pybootchartgui/examples/1/proc_stat.log    | 1562 ++++
 .../pybootchartgui/examples/1/pybootchartgui.png   |  Bin 0 -> 102909 bytes
 scripts/pybootchartgui/examples/2/header           |    6 +
 .../pybootchartgui/examples/2/java-png-result.png  |  Bin 0 -> 173535 bytes
 scripts/pybootchartgui/examples/2/kernel_pacct     |  Bin 0 -> 321408 bytes
 .../pybootchartgui/examples/2/proc_diskstats.log   | 5262 ++++++++++++
 scripts/pybootchartgui/examples/2/proc_ps.log      | 8940 +++++++++++++++++++
 scripts/pybootchartgui/examples/2/proc_stat.log    | 2050 +++++
 .../pybootchartgui/examples/3/f11_bootchart.tgz    |  Bin 0 -> 77979 bytes
 .../pybootchartgui/examples/4/f11_bootchart2.tgz   |  Bin 0 -> 77979 bytes
 scripts/pybootchartgui/pybootchartgui.py           |    7 +
 scripts/pybootchartgui/pybootchartgui/batch.py     |   23 +
 scripts/pybootchartgui/pybootchartgui/draw.py      |  355 +
 scripts/pybootchartgui/pybootchartgui/gui.py       |  273 +
 scripts/pybootchartgui/pybootchartgui/main.py      |   71 +
 scripts/pybootchartgui/pybootchartgui/parsing.py   |  223 +
 .../pybootchartgui/pybootchartgui/process_tree.py  |  270 +
 scripts/pybootchartgui/pybootchartgui/samples.py   |   93 +
 .../pybootchartgui/tests/parser_test.py            |   93 +
 .../pybootchartgui/tests/process_tree_test.py      |   78 +
 41 files changed, 38502 insertions(+), 0 deletions(-)
 create mode 100644 scripts/pybootchartgui/AUTHORS
 create mode 100644 scripts/pybootchartgui/COPYING
 create mode 100644 scripts/pybootchartgui/README
 create mode 100644 scripts/pybootchartgui/examples/1/extract.proc_diskstats.log
 create mode 100644 scripts/pybootchartgui/examples/1/extract.proc_ps.log
 create mode 100644 scripts/pybootchartgui/examples/1/extract.proc_stat.log
 create mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.1.log
 create mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.2.log
 create mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.3.log
 create mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.3a.log
 create mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.3b.log
 create mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.3c.log
 create mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.3d.log
 create mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.3e.log
 create mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.4.log
 create mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.5.log
 create mode 100644 scripts/pybootchartgui/examples/1/extract2.proc_ps.log
 create mode 100644 scripts/pybootchartgui/examples/1/header
 create mode 100644 scripts/pybootchartgui/examples/1/java-png-result.png
 create mode 100644 scripts/pybootchartgui/examples/1/proc_diskstats.log
 create mode 100644 scripts/pybootchartgui/examples/1/proc_ps.log
 create mode 100644 scripts/pybootchartgui/examples/1/proc_stat.log
 create mode 100644 scripts/pybootchartgui/examples/1/pybootchartgui.png
 create mode 100644 scripts/pybootchartgui/examples/2/header
 create mode 100644 scripts/pybootchartgui/examples/2/java-png-result.png
 create mode 100644 scripts/pybootchartgui/examples/2/kernel_pacct
 create mode 100644 scripts/pybootchartgui/examples/2/proc_diskstats.log
 create mode 100644 scripts/pybootchartgui/examples/2/proc_ps.log
 create mode 100644 scripts/pybootchartgui/examples/2/proc_stat.log
 create mode 100755 scripts/pybootchartgui/examples/3/f11_bootchart.tgz
 create mode 100755 scripts/pybootchartgui/examples/4/f11_bootchart2.tgz
 create mode 100755 scripts/pybootchartgui/pybootchartgui.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/__init__.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/batch.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/draw.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/gui.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/main.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/parsing.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/process_tree.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/samples.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/tests/parser_test.py
 create mode 100644 scripts/pybootchartgui/pybootchartgui/tests/process_tree_test.py

# Remove the patch since it is too big to send via email, please fetch

# the patch via the git repo
#2 lore raw

PATCH 2/5 pybootchartgui: remove the original examples

In reply to Robert Yang

Remove the examples since they would not work any more, and they cost much disk space.

[YOCTO #2403]

---
 .../examples/1/extract.proc_diskstats.log          |  141 -
 .../pybootchartgui/examples/1/extract.proc_ps.log  |  861 --
 .../examples/1/extract.proc_stat.log               |  141 -
 .../examples/1/extract.processtree.1.log           |  861 --
 .../examples/1/extract.processtree.2.log           |  861 --
 .../examples/1/extract.processtree.3.log           |  861 --
 .../examples/1/extract.processtree.3a.log          |  861 --
 .../examples/1/extract.processtree.3b.log          |  200 -
 .../examples/1/extract.processtree.3c.log          |  200 -
 .../examples/1/extract.processtree.3d.log          |  108 -
 .../examples/1/extract.processtree.3e.log          |  100 -
 .../examples/1/extract.processtree.4.log           |  100 -
 .../examples/1/extract.processtree.5.log           |  100 -
 .../pybootchartgui/examples/1/extract2.proc_ps.log |  861 --
 scripts/pybootchartgui/examples/1/header           |    7 -
 .../pybootchartgui/examples/1/java-png-result.png  |  Bin 138999 -> 0 bytes
 .../pybootchartgui/examples/1/proc_diskstats.log   | 3171 -------
 scripts/pybootchartgui/examples/1/proc_ps.log      | 9041 --------------------
 scripts/pybootchartgui/examples/1/proc_stat.log    | 1562 ----
 .../pybootchartgui/examples/1/pybootchartgui.png   |  Bin 102909 -> 0 bytes
 scripts/pybootchartgui/examples/2/header           |    6 -
 .../pybootchartgui/examples/2/java-png-result.png  |  Bin 173535 -> 0 bytes
 scripts/pybootchartgui/examples/2/kernel_pacct     |  Bin 321408 -> 0 bytes
 .../pybootchartgui/examples/2/proc_diskstats.log   | 5262 ------------
 scripts/pybootchartgui/examples/2/proc_ps.log      | 8940 -------------------
 scripts/pybootchartgui/examples/2/proc_stat.log    | 2050 -----
 .../pybootchartgui/examples/3/f11_bootchart.tgz    |  Bin 77979 -> 0 bytes
 .../pybootchartgui/examples/4/f11_bootchart2.tgz   |  Bin 77979 -> 0 bytes
 28 files changed, 0 insertions(+), 36295 deletions(-)
 delete mode 100644 scripts/pybootchartgui/examples/1/extract.proc_diskstats.log
 delete mode 100644 scripts/pybootchartgui/examples/1/extract.proc_ps.log
 delete mode 100644 scripts/pybootchartgui/examples/1/extract.proc_stat.log
 delete mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.1.log
 delete mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.2.log
 delete mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.3.log
 delete mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.3a.log
 delete mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.3b.log
 delete mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.3c.log
 delete mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.3d.log
 delete mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.3e.log
 delete mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.4.log
 delete mode 100644 scripts/pybootchartgui/examples/1/extract.processtree.5.log
 delete mode 100644 scripts/pybootchartgui/examples/1/extract2.proc_ps.log
 delete mode 100644 scripts/pybootchartgui/examples/1/header
 delete mode 100644 scripts/pybootchartgui/examples/1/java-png-result.png
 delete mode 100644 scripts/pybootchartgui/examples/1/proc_diskstats.log
 delete mode 100644 scripts/pybootchartgui/examples/1/proc_ps.log
 delete mode 100644 scripts/pybootchartgui/examples/1/proc_stat.log
 delete mode 100644 scripts/pybootchartgui/examples/1/pybootchartgui.png
 delete mode 100644 scripts/pybootchartgui/examples/2/header
 delete mode 100644 scripts/pybootchartgui/examples/2/java-png-result.png
 delete mode 100644 scripts/pybootchartgui/examples/2/kernel_pacct
 delete mode 100644 scripts/pybootchartgui/examples/2/proc_diskstats.log
 delete mode 100644 scripts/pybootchartgui/examples/2/proc_ps.log
 delete mode 100644 scripts/pybootchartgui/examples/2/proc_stat.log
 delete mode 100755 scripts/pybootchartgui/examples/3/f11_bootchart.tgz
 delete mode 100755 scripts/pybootchartgui/examples/4/f11_bootchart2.tgz

# Remove the patch since it is too big to send via email, please fetch

# the code via the git repo
#3 lore raw

PATCH 3/5 pybootchartgui: make the build profiling in pictures

In reply to Robert Yang

The original patch is from Richard, I rebased it to the up-to-date upstream code, here are the original messages from him:

We have just merged Beth's initial buildstats logging work. I was sitting wondering how to actually evaluate the numbers as I wanted to know "where are we spending the time?".

It occurred to me that I wanted a graph very similar to that generated by bootchart. I looked around and found pyboootchartgui and then hacked it around a bit and coerced it to start producing charts like:

http://tim.rpsys.net/bootchart.png

which is the initial "pseudo-native" part of the build. This was simple enough to test with.

I then tried graphing a poky-image-sato. To get a graph I could actually read, I stripped out any task taking less than 8 seconds and scaled the x axis from 25 units per second to one unit per second. The result was:

http://tim.rpsys.net/bootchart2.png
(warning this is a 2.7MB png)

I also added in a little bit of colour coding for the second chart. Interestingly it looks like there is more yellow than green meaning configure is a bigger drain on the build time not that its unexpected :/.

I quite enjoyed playing with this and on a serious note, the gradient of the task graph makes me a little suspicious of whether the overhead of launching tasks in bitbake itself is having some effect on build time. Certainly on the first graph there are some interesting latencies showing up.

Anyhow, I think this is the first time bitbake's task execution has been visualised and there are some interesting things we can learn from it. I'm hoping this is a start of a much more detailed understanding of the build process with respect to performance.

[YOCTO #2403]

---
 scripts/pybootchartgui/pybootchartgui/batch.py   |    4 +-
 scripts/pybootchartgui/pybootchartgui/draw.py    |  131 +++++++++++++++-------
 scripts/pybootchartgui/pybootchartgui/gui.py     |    4 +-
 scripts/pybootchartgui/pybootchartgui/parsing.py |   47 +++++----
 4 files changed, 122 insertions(+), 64 deletions(-)
scripts/pybootchartgui/pybootchartgui/batch.py +2 -2
index bd67c93..3c1dbf8 100644
@@ -14,10 +14,10 @@ def render(res, format, filename):
         return 10
 
     make_surface, write_surface = handlers[format]
-    w,h = draw.extents(*res)
+    w,h = draw.extents(res)
     w = max(w, draw.MIN_IMG_W)
     surface = make_surface(w,h)
     ctx = cairo.Context(surface)
-    draw.render(ctx, *res)
+    draw.render(ctx, res)
     write_surface(surface)
 
scripts/pybootchartgui/pybootchartgui/draw.py +92 -39

206 lines not on this page · raw message

scripts/pybootchartgui/pybootchartgui/gui.py +2 -2
index 87081e3..310c3d1 100644
@@ -35,7 +35,7 @@ class PyBootchartWidget(gtk.DrawingArea):
 		self.zoom_ratio = 1.0
                 self.x, self.y = 0.0, 0.0
 
-		self.chart_width, self.chart_height = draw.extents(*res)
+		self.chart_width, self.chart_height = draw.extents(res)
 		self.hadj = None
 		self.vadj = None
 
@@ -56,7 +56,7 @@ class PyBootchartWidget(gtk.DrawingArea):
 		cr.paint()
                 cr.scale(self.zoom_ratio, self.zoom_ratio)
                 cr.translate(-self.x, -self.y)
-		draw.render(cr, *self.res)
+		draw.render(cr, self.res)
 
 	def position_changed(self):
 		self.emit("position-changed", self.x, self.y)
scripts/pybootchartgui/pybootchartgui/parsing.py +26 -21

73 lines not on this page · raw message

Signature · 1 line
1.7.1
#4 lore raw

PATCH 4/5 pybootchartgui: split the output chart into multiple ones

In reply to Robert Yang

Split the output chart into multiple ones to make it more readable, it only works with "-o path", which means that it doesn't work if the user doesn't want to save the chart to the disk. For example:

$ ./pybootchartgui.py /path/to/tmp/buildstats/core-image-sato-qemux86/201205301810/ -f svg -s 5 -o /tmp/
bootchart written to /tmp/bootchart_1.svg
bootchart written to /tmp/bootchart_2.svg
bootchart written to /tmp/bootchart_3.svg
bootchart written to /tmp/bootchart_4.svg
bootchart written to /tmp/bootchart_5.svg

[YOCTO #2403]

---
 scripts/pybootchartgui/pybootchartgui/main.py    |   14 +++++++-
 scripts/pybootchartgui/pybootchartgui/parsing.py |   36 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)
scripts/pybootchartgui/pybootchartgui/main.py +12 -2
index bf50afb..fce8dd3 100644
@@ -17,6 +17,8 @@ def _mk_options_parser():
 			  help="image format (...); default format ...")
 	parser.add_option("-o", "--output", dest="output", metavar="PATH", default=None,
 			  help="output path (file or directory) where charts are stored")
+	parser.add_option("-s", "--split", dest="num", type=int, default=1,
+			  help="split the output chart into <NUM> charts, only works with \"-o PATH\"")
 	parser.add_option("-n", "--no-prune", action="store_false", dest="prune", default=True,
 			  help="do not prune the process tree")
 	parser.add_option("-q", "--quiet", action="store_true", dest="quiet", default=False,
@@ -59,8 +61,16 @@ def main(argv=None):
 			gui.show(res)
 		else:
 			filename = _get_filename(args, options)
-			batch.render(res, options.format, filename)
-			print "bootchart written to", filename
+			res_list = parsing.split_res(res, options.num)
+			n = 1
+			for r in res_list:
+				if len(res_list) == 1:
+					f = filename + "." + options.format
+				else:
+					f = filename + "_" + str(n) + "." + options.format
+					n = n + 1
+				batch.render(r, options.format, f)
+				print "bootchart written to", f
 		return 0
 	except parsing.ParseError, ex:
 		print("Parse error: %s" % ex)
scripts/pybootchartgui/pybootchartgui/parsing.py +36 -0
index 11a0829..c64eba0 100644
@@ -226,3 +226,39 @@ def parse(paths, prune):
     #monitored_app = state.headers.get("profile.process")
     #proc_tree = ProcessTree(state.ps_stats, monitored_app, prune)
     return state
+
+def split_res(res, n):
+    """ Split the res into n pieces """
+    res_list = []
+    if n > 1:
+        s_list = sorted(res.start.keys())
+        frag_size = len(s_list) / float(n)
+        # Need the top value
+        if frag_size > int(frag_size):
+            frag_size = int(frag_size + 1)
+        else:
+            frag_size = int(frag_size)
+
+        start = 0
+        end = frag_size
+        while start < end:
+            state = ParserState()
+            for i in range(start, end):
+                # Add these lines for reference
+                #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
+            start = end
+            end = end + frag_size
+            if end > len(s_list):
+                end = len(s_list)
+            res_list.append(state)
+    else:
+        res_list.append(res)
+    return res_list
Signature · 1 line
1.7.1
#5 lore raw

PATCH 5/5 pybootchartgui: Fix the filename and add a default format

In reply to Robert Yang

* Fix teh output filename to make it easy to use
* Add a default output format (svg)
* Fix the usage message
* Fix the version to v1.0.0

Currently, the help messages are:

$ ./pybootchartgui.py --help
Usage: pybootchartgui.py [options] /path/to/tmp/buildstats/<recipe-machine>/<BUILDNAME>/

Options:

  --version             show program's version number and exit
  -h, --help            show this help message and exit
  -i, --interactive     start in active mode
  -f FORMAT, --format=FORMAT
                        image format: svg, pdf, png, [default: svg]
  -o PATH, --output=PATH
                        output path (file or directory) where charts are
                        stored
  -s NUM, --split=NUM   split the output chart into <NUM> charts, only works
                        with "-o PATH"
  -n, --no-prune        do not prune the process tree
  -q, --quiet           suppress informational messages
  --very-quiet          suppress all messages except errors
  --verbose             print all messages

[YOCTO #2403]

---
 scripts/pybootchartgui/pybootchartgui/main.py |   33 ++++++++++--------------
 1 files changed, 14 insertions(+), 19 deletions(-)
scripts/pybootchartgui/pybootchartgui/main.py +14 -19
index fce8dd3..e70ab13 100644
@@ -8,13 +8,13 @@ import batch
 
 def _mk_options_parser():
 	"""Make an options parser."""
-	usage = "%prog [options] PATH, ..., PATH"
-	version = "%prog v0.0.0"
+	usage = "%prog [options] /path/to/tmp/buildstats/<recipe-machine>/<BUILDNAME>/"
+	version = "%prog v1.0.0"
 	parser = optparse.OptionParser(usage, version=version)
 	parser.add_option("-i", "--interactive", action="store_true", dest="interactive", default=False, 
 			  help="start in active mode")
-	parser.add_option("-f", "--format", dest="format", default = None,
-			  help="image format (...); default format ...")
+	parser.add_option("-f", "--format", dest="format", default="svg", choices=["svg", "pdf", "png"],
+			  help="image format: svg, pdf, png, [default: %default]")
 	parser.add_option("-o", "--output", dest="output", metavar="PATH", default=None,
 			  help="output path (file or directory) where charts are stored")
 	parser.add_option("-s", "--split", dest="num", type=int, default=1,
@@ -29,20 +29,15 @@ def _mk_options_parser():
 			  help="print all messages")
 	return parser
 
-def _get_filename(paths, options):
-	"""Construct a usable filename for outputs based on the paths and options given on the commandline."""
-	dir = ""
+def _get_filename(path):
+	"""Construct a usable filename for outputs"""
+	dir = "."
 	file = "bootchart"
-	if options.output != None and not(os.path.isdir(options.output)):
-		return options.output
-	if options.output != None:
-		dir = options.output
-	if len(paths) == 1:
-		if os.path.isdir(paths[0]):
-			file = os.path.split(paths[0])[-1]
-		elif os.path.splitext(paths[0])[1] in [".tar", ".tgz", ".tar.gz"]:
-			file = os.path.splitext(paths[0])[0]
-	return os.path.join(dir, file + "." + options.format)
+	if os.path.isdir(path):
+		dir = path
+	elif path != None:
+		file = path
+	return os.path.join(dir, file)
 
 def main(argv=None):
 	try:
@@ -57,10 +52,10 @@ def main(argv=None):
 			return 2
 
 		res = parsing.parse(args, options.prune)
-		if options.interactive or options.format == None:
+		if options.interactive or options.output == None:
 			gui.show(res)
 		else:
-			filename = _get_filename(args, options)
+			filename = _get_filename(options.output)
 			res_list = parsing.split_res(res, options.num)
 			n = 1
 			for r in res_list:
Signature · 1 line
1.7.1
Applied
#6 lore raw
In reply to Robert Yang
Quoted 51 lines · Robert Yang

Note: Removed the patch details for PATCH 1/5 and 2/5 since they are too
big(bigger than 2M) to send via email, please fetch the patch via the git repo

// Robert

The following changes since commit df8f55a919b3cc602ce1f1c51630c7edf6e36b55:

ltp: Add patch to correct failing build (2012-06-05 23:05:00 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib robert/chart
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/chart

Robert Yang (5):
pybootchartgui: add the original code
pybootchartgui: remove the original examples
pybootchartgui: make the build profiling in pictures
pybootchartgui: split the output chart into multiple ones
pybootchartgui: Fix the filename and add a default format

  scripts/pybootchartgui/AUTHORS                     |   11 +
  scripts/pybootchartgui/COPYING                     |  674 ++++++++++++++++++++
  scripts/pybootchartgui/README                      |   36 +
  scripts/pybootchartgui/pybootchartgui.py           |    7 +
  scripts/pybootchartgui/pybootchartgui/batch.py     |   23 +
  scripts/pybootchartgui/pybootchartgui/draw.py      |  408 ++++++++++++
  scripts/pybootchartgui/pybootchartgui/gui.py       |  273 ++++++++
  scripts/pybootchartgui/pybootchartgui/main.py      |   76 +++
  scripts/pybootchartgui/pybootchartgui/parsing.py   |  264 ++++++++
  .../pybootchartgui/pybootchartgui/process_tree.py  |  270 ++++++++
  scripts/pybootchartgui/pybootchartgui/samples.py   |   93 +++
  .../pybootchartgui/tests/parser_test.py            |   93 +++
  .../pybootchartgui/tests/process_tree_test.py      |   78 +++
  13 files changed, 2306 insertions(+), 0 deletions(-)

create mode 100644 scripts/pybootchartgui/AUTHORS
create mode 100644 scripts/pybootchartgui/COPYING
create mode 100644 scripts/pybootchartgui/README
create mode 100755 scripts/pybootchartgui/pybootchartgui.py
create mode 100644 scripts/pybootchartgui/pybootchartgui/__init__.py create mode 100644 scripts/pybootchartgui/pybootchartgui/batch.py create mode 100644 scripts/pybootchartgui/pybootchartgui/draw.py create mode 100644 scripts/pybootchartgui/pybootchartgui/gui.py create mode 100644 scripts/pybootchartgui/pybootchartgui/main.py create mode 100644 scripts/pybootchartgui/pybootchartgui/parsing.py create mode 100644 scripts/pybootchartgui/pybootchartgui/process_tree.py create mode 100644 scripts/pybootchartgui/pybootchartgui/samples.py create mode 100644 scripts/pybootchartgui/pybootchartgui/tests/parser_test.py create mode 100644 scripts/pybootchartgui/pybootchartgui/tests/process_tree_test.py

Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Merged into OE-Core

Thanks
Sau!