debian/0000755000000000000000000000000012062164120007160 5ustar debian/bootchart2.install0000644000000000000000000000002012062164120012607 0ustar etc/ lib/ sbin/ debian/pybootchartgui.desktop0000644000000000000000000000030512062164120013614 0ustar [Desktop Entry] Name=pyBootchartGUI GenericName=Bootchart2 data viewer GenericName[it]=Visualizzatore dati Bootchart2 Exec=pybootchartgui Terminal=false Type=Application Categories=System;Monitor; debian/rules0000755000000000000000000000054712062164120010246 0ustar #!/usr/bin/make -f # -*- makefile -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 %: dh $@ \ --with python2 override_dh_installchangelogs: dh_installchangelogs NEWS override_dh_auto_test: override_dh_installinit: dh_installinit \ --name=bootchart-done \ --no-start \ --update-rcd-params="start 99 1 2 3 4 5 6 . stop 99 0 ." debian/bootchart2.manpages0000644000000000000000000000003212062164120012737 0ustar bootchart2.1 bootchartd.1 debian/pybootchartgui.menu0000644000000000000000000000022712062164120013112 0ustar ?package(pybootchartgui):\ needs="X11" \ section="Applications/System/Monitoring" \ title="pyBootchartGUI" \ command="/usr/bin/pybootchartgui" debian/bootchart2.bootchart-done.init0000644000000000000000000000247512062164120015033 0ustar #! /bin/sh ### BEGIN INIT INFO # Provides: bootchart2 # Required-Start: $remote_fs $all # Required-Stop: # Default-Start: 1 2 3 4 5 # Default-Stop: # Short-Description: Stop bootchartd # Description: This script stops the bootchartd daemon after the # system booted. ### END INIT INFO # Author: David Paleino # Do NOT "set -e" # PATH should only include /usr/* if it runs after the mountnfs.sh script PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="boot process analyser" NAME=bootchartd DAEMON=/sbin/$NAME DAEMON_ARGS="" PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/bootchart2 # Exit if the package is not installed [ -x "$DAEMON" ] || exit 0 # Read configuration variable file if it is present [ -r /etc/bootchartd.conf ] && . /etc/bootchartd.conf # Load the VERBOSE setting and other rcS variables . /lib/init/vars.sh # Define LSB log_* functions. # Depend on lsb-base (>= 3.0-6) to ensure that this file is present. . /lib/lsb/init-functions case "$1" in start) [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" $DAEMON stop case "$?" in 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; esac ;; stop|restart|force-reload) # do nothing ;; *) echo "Usage: $SCRIPTNAME start" >&2 exit 3 ;; esac : debian/pybootchartgui.docs0000644000000000000000000000002312062164120013070 0ustar README.pybootchart debian/bootchart2.lintian-overrides0000644000000000000000000000013612062164120014607 0ustar # it's intentional, indeed. bootchart2: package-contains-empty-directory lib/bootchart/tmpfs/ debian/watch0000644000000000000000000000012112062164120010203 0ustar version=3 http://githubredir.debian.net/github/mmeeks/bootchart/(\d+.*)\.tar\.gz debian/pybootchartgui.manpages0000644000000000000000000000002112062164120013731 0ustar pybootchartgui.1 debian/control0000644000000000000000000000273312062164120010570 0ustar Source: bootchart2 Section: utils Priority: optional Maintainer: David Paleino Uploaders: Riccardo Magliocchetti Build-Depends: debhelper (>= 8~) , python (>= 2.6.6-3~) Standards-Version: 3.9.3 Homepage: http://github.com/mmeeks/bootchart Vcs-Git: git://git.debian.org/collab-maint/bootchart2.git Vcs-Browser: http://git.debian.org/?p=collab-maint/bootchart2.git X-Python-Version: >= 2.6 Package: bootchart2 Architecture: linux-any Depends: ${shlibs:Depends} , ${misc:Depends} , lsb-base (>= 3.0-6~) Conflicts: bootchart Recommends: pybootchartgui Description: boot process performance analyser bootchart2 is a boot process performance analyser: a tool that lets you collect and analyse data from your boot process. bootchart2 origins from bootchart, and has some advantages over it: . - more detailed kernel charting: uses the taskstats interface, instead of /proc/*/stat - the data collector has been rewritten to make it faster . After the boot, you can view the logged data with a separately-provided GUI. Package: pybootchartgui Architecture: all Depends: ${misc:Depends} , ${python:Depends} , python-cairo , python-gtk2 Description: viewer for boot process performance analysis results bootchart2 is a boot process performance analyser: a tool that lets you collect and analyse data from your boot process. . This package provides pybootchartgui, a graphical program to view the data recorded by bootchart2. debian/changelog0000644000000000000000000000673712062164120011047 0ustar bootchart2 (0.14.4-3) unstable; urgency=low * Added missing dependency on lsb-base (>= 3.0-6). Thanks to Adam D. Barratt for noticing this! -- David Paleino Wed, 12 Dec 2012 21:25:44 +0100 bootchart2 (0.14.4-2) unstable; urgency=low * Acknowledge NMU. * Provide also an initscript (Closes: #694403) -- David Paleino Sat, 08 Dec 2012 19:35:08 +0100 bootchart2 (0.14.4-1.1) unstable; urgency=low * Non-maintainer upload. * Apply patches supplied by upstream to fix RC bug (Closes: #642343) - 0001-pybootchartgui-fix-parsing-of-non-ascii-bytes-in-log.patch - 0002-pybootchartgui-skip-malformed-taskstats-lines.patch - 0003-pybootchartgui-ensure-a-MemSample-is-valid-before-st.patch - 0004-pybootchartgui-be-more-tolerant-when-parsing-proc_me.patch -- Jonathan McCrohan Sat, 08 Sep 2012 13:54:28 +0100 bootchart2 (0.14.4-1) unstable; urgency=low * New upstream version - added openbox and xfce4 to EXIT_PROC (Closes: #671869, #670659) - added support for initramfs (Closes: #603656) * Updated debian/copyright * Standards-Version bump to 3.9.3, no changes needed -- David Paleino Thu, 07 Jun 2012 23:25:10 +0200 bootchart2 (0.14.2-1) unstable; urgency=low * New upstream version * Use linux-any as architecture for bootchart2 -- David Paleino Sun, 16 Oct 2011 17:46:54 +0200 bootchart2 (0.14.1-1) unstable; urgency=low * New upstream version - fixed AttributeError on Trace instance (Closes: #633894) - use correct extension when saving pybootchartgui's output (Closes: #631905) - document available output formats for pybootchartgui (Closes: #631904) * Added missing runtime dependencies to pybootchartgui (Closes: #633070) * Patches merged upstream, removed * Disabled build-time testing (fails somehow) * Standards-Version bumped to 3.9.2, no changes needed * Package converted to dh_python2 -- David Paleino Wed, 07 Sep 2011 09:37:58 +0200 bootchart2 (0.14.0-3) unstable; urgency=low * Bump minimum Python version to 2.6 (Closes: #619360) -- David Paleino Tue, 29 Mar 2011 11:19:30 +0200 bootchart2 (0.14.0-2) unstable; urgency=low * Fix installed files in pybootchartgui (Closes: #619165) -- David Paleino Mon, 21 Mar 2011 20:19:40 +0100 bootchart2 (0.14.0-1) unstable; urgency=low * New upstream version - manpages added, thanks to Francesca Ciceri (Closes: #611472) * Fix auto-reference in manpage (01-fix_manpage.patch) * Added Riccardo as co-maintainer (he's upstream too) -- David Paleino Mon, 21 Mar 2011 11:05:11 +0100 bootchart2 (0.12.6-1) unstable; urgency=low * New upstream version * Upstream code switched from GPL-3+ to GPL-2+, fix this in debian/copyright, and do the same for debian/* * Riccardo Magliocchetti has been added to the list of AUTHORS. Congratulations, xrmx! :) * 00-fix_alternative_init.patch merged upstream, removed -- David Paleino Sun, 26 Dec 2010 12:32:18 +0100 bootchart2 (0.12.4-2) unstable; urgency=low * Fix cmdline parsing for alternative init system, thanks to Riccardo Magliocchetti for the patch (Closes: #602684) -- David Paleino Thu, 11 Nov 2010 22:22:59 +0100 bootchart2 (0.12.4-1) unstable; urgency=low * Initial release (Closes: #590858) -- David Paleino Sun, 19 Sep 2010 19:07:42 +0200 debian/copyright0000644000000000000000000000343212062164120011115 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Source: http://github.com/mmeeks/bootchart Files: * Copyright: © Anders Norgaard © Michael Meeks © Scott James Remnant © Henning Niss © Riccardo Magliocchetti License: GPL-2+ Files: collector/collector.c Copyright: © 2005, Shailabh Nagar, IBM Corp. © 2006, Balbir Singh, IBM Corp. © 2006, Jay Lan, SGI © 2009-2010, Novell, Inc. License: GPL-2+ Files: collector/output.c collector/tasks.c Copyright: © 2009-2010, Novell, Inc. License: GPL-2+ Files: collector/tasks-netlink.c Copyright: © 2005, BULL SA. © 2005, Matt Helsley, IBM Corp. © 2007, IBM Corporation © 2010, Novell, Inc. License: GPL-2+ Files: debian/* Copyright: © 2010-2012, David Paleino License: GPL-2+ Files: debian/manpages/* Copyright: © 2011, Francesca Ciceri License: GPL-2+ License: GPL-2+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. . This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this program. If not, see . X-Comment: on Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". debian/bootchart2.docs0000644000000000000000000000001412062164120012074 0ustar README TODO debian/source/0000755000000000000000000000000012062164120010460 5ustar debian/source/format0000644000000000000000000000001412062164120011666 0ustar 3.0 (quilt) debian/pybootchartgui.install0000644000000000000000000000011112062164120013604 0ustar usr/bin/ usr/lib/ debian/pybootchartgui.desktop usr/share/applications/ debian/patches/0000755000000000000000000000000012062164120010607 5ustar debian/patches/series0000644000000000000000000000042512062164120012025 0ustar 00-fix_python_sitedir.patch 0001-pybootchartgui-fix-parsing-of-non-ascii-bytes-in-log.patch 0002-pybootchartgui-skip-malformed-taskstats-lines.patch 0003-pybootchartgui-ensure-a-MemSample-is-valid-before-st.patch 0004-pybootchartgui-be-more-tolerant-when-parsing-proc_me.patch debian/patches/0004-pybootchartgui-be-more-tolerant-when-parsing-proc_me.patch0000644000000000000000000000342612062164120024455 0ustar From 62a80e0848bf3f5119a32bb82c7e141bd49d5e11 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Fri, 17 Aug 2012 18:02:12 +0200 Subject: [PATCH] pybootchartgui: be more tolerant when parsing proc_meminfo.log waasdorp reports in bug #40 that we are raising an exception if a line in proc_meminfo.log is not well formed. He is right because we were trying to access matches of a regexp that did not match. That is obviously silly but it is also silly to stop processing all the data if a line is wrong, even a line that we are not interested in it. Instead ignore the line and skip the sample if it is not valid. Example of broken line: Shmem: While at it remove an unused variable --- pybootchartgui/parsing.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pybootchartgui/parsing.py b/pybootchartgui/parsing.py index 0c54884..845b3ae 100644 --- a/pybootchartgui/parsing.py +++ b/pybootchartgui/parsing.py @@ -453,8 +453,6 @@ def _parse_proc_meminfo_log(file): Parse file for global memory statistics. The format of relevant lines should be: ^key: value( unit)? """ - used_values = ('MemTotal', 'MemFree', 'Buffers', 'Cached', 'SwapTotal', 'SwapFree',) - mem_stats = [] meminfo_re = re.compile(r'([^ \t:]+):\s*(\d+).*') @@ -463,9 +461,8 @@ def _parse_proc_meminfo_log(file): for line in lines: match = meminfo_re.match(line) - if not match: - raise ParseError("Invalid meminfo line \"%s\"" % match.groups(0)) - sample.add_value(match.group(1), int(match.group(2))) + if match: + sample.add_value(match.group(1), int(match.group(2))) if sample.valid(): mem_stats.append(sample) -- 1.7.10.4 debian/patches/0001-pybootchartgui-fix-parsing-of-non-ascii-bytes-in-log.patch0000644000000000000000000000505012062164120024265 0ustar From 9a7ff9823ae8562e11094a5a7155af067733ae95 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Sun, 17 Jun 2012 12:53:42 +0200 Subject: [PATCH] pybootchartgui: fix parsing of non-ascii bytes in logs It looks like the days of ascii logs is gone so decode all the files we read as utf-8. Fix #38. --- pybootchartgui/parsing.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: bootchart2-0.14.4/pybootchartgui/parsing.py =================================================================== --- bootchart2-0.14.4.orig/pybootchartgui/parsing.py 2012-09-08 13:13:36.000000000 +0100 +++ bootchart2-0.14.4/pybootchartgui/parsing.py 2012-09-08 13:13:36.000000000 +0100 @@ -228,7 +228,7 @@ value = line.strip() headers[last] += value return headers, last - return reduce(parse, file.read().decode().split('\n'), (defaultdict(str),''))[0] + return reduce(parse, file.read().decode('utf-8').split('\n'), (defaultdict(str),''))[0] def _parse_timed_blocks(file): """Parses (ie., splits) a file into so-called timed-blocks. A @@ -242,7 +242,7 @@ return (int(lines[0]), lines[1:]) except ValueError: raise ParseError("expected a timed-block, but timestamp '%s' is not an integer" % lines[0]) - blocks = file.read().decode().split('\n\n') + blocks = file.read().decode('utf-8').split('\n\n') return [parse(block) for block in blocks if block.strip() and not block.endswith(' not running\n')] def _parse_proc_ps_log(writer, file): @@ -491,7 +491,7 @@ processMap['k-boot'] = kernel base_ts = False max_ts = 0 - for line in file.read().decode().split('\n'): + for line in file.read().decode('utf-8').split('\n'): t = timestamp_re.match (line) if t is None: # print "duff timestamp " + line @@ -579,7 +579,7 @@ def _parse_paternity_log(writer, file): parent_map = {} parent_map[0] = 0 - for line in file.read().decode().split('\n'): + for line in file.read().decode('utf-8').split('\n'): elems = line.split(' ') # if len (elems) >= 2: # print "paternity of %d is %d" % (int(elems[0]), int(elems[1])) @@ -590,7 +590,7 @@ def _parse_cmdline_log(writer, file): cmdLines = {} - for block in file.read().decode().split('\n\n'): + for block in file.read().decode('utf-8').split('\n\n'): lines = block.split('\n') if len (lines) >= 3: # print "Lines '%s'" % (lines[0]) debian/patches/0003-pybootchartgui-ensure-a-MemSample-is-valid-before-st.patch0000644000000000000000000000367412062164120024252 0ustar From d39566348784eb80672f0d0bd78f0a839424281c Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Sun, 17 Jun 2012 14:50:05 +0200 Subject: [PATCH] pybootchartgui: ensure a MemSample is valid before storing it Fix #39 --- pybootchartgui/parsing.py | 6 +++--- pybootchartgui/samples.py | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pybootchartgui/parsing.py b/pybootchartgui/parsing.py index 778149b..18eb17c 100644 --- a/pybootchartgui/parsing.py +++ b/pybootchartgui/parsing.py @@ -465,10 +465,10 @@ def _parse_proc_meminfo_log(file): match = meminfo_re.match(line) if not match: raise ParseError("Invalid meminfo line \"%s\"" % match.groups(0)) - if match.group(1) in used_values: - sample.add_value(match.group(1), int(match.group(2))) + sample.add_value(match.group(1), int(match.group(2))) - mem_stats.append(sample) + if sample.valid(): + mem_stats.append(sample) return mem_stats diff --git a/pybootchartgui/samples.py b/pybootchartgui/samples.py index ce703b8..a7da2ea 100644 --- a/pybootchartgui/samples.py +++ b/pybootchartgui/samples.py @@ -38,12 +38,20 @@ class CPUSample: str(self.sys) + "\t" + str(self.io) + "\t" + str (self.swap) class MemSample: + used_values = ('MemTotal', 'MemFree', 'Buffers', 'Cached', 'SwapTotal', 'SwapFree',) + def __init__(self, time): self.time = time self.records = {} def add_value(self, name, value): - self.records[name] = value + if name in MemSample.used_values: + self.records[name] = value + + def valid(self): + keys = self.records.keys() + # discard incomplete samples + return [v for v in MemSample.used_values if v not in keys] == [] class ProcessSample: def __init__(self, time, state, cpu_sample): -- 1.7.10.4 debian/patches/00-fix_python_sitedir.patch0000644000000000000000000000077412062164120015767 0ustar From: David Paleino Subject: dh_python2 expects modules to be in dist-packages Origin: vendor Forwarded: not-needed --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- bootchart2.orig/Makefile +++ bootchart2/Makefile @@ -17,7 +17,7 @@ else PY_LIBDIR = /usr$(LIBDIR)/python2.6 endif endif -PY_SITEDIR ?= $(PY_LIBDIR)/site-packages +PY_SITEDIR ?= $(PY_LIBDIR)/dist-packages LIBC_A_PATH = /usr$(LIBDIR) SYSTEMD_UNIT_DIR = $(LIBDIR)/systemd/system COLLECTOR = \ debian/patches/0002-pybootchartgui-skip-malformed-taskstats-lines.patch0000644000000000000000000000123712062164120023314 0ustar From 77d7c35c9c03b21fdc8a1136e1d935965336ffa7 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Sun, 17 Jun 2012 14:34:30 +0200 Subject: [PATCH] pybootchartgui: skip malformed taskstats lines Partially fix #39 --- pybootchartgui/parsing.py | 2 ++ 1 file changed, 2 insertions(+) --- a/pybootchartgui/parsing.py +++ b/pybootchartgui/parsing.py @@ -315,6 +315,8 @@ for line in lines: if line is '': continue tokens = line.split(' ') + if len(tokens) != 6: + continue opid, ppid, cmd = int(tokens[0]), int(tokens[1]), tokens[2] try: debian/compat0000644000000000000000000000000212062164120010356 0ustar 8