14 files changed, 2207 insertions, 0 deletions

diff --git a/scripts/pybootchartgui/AUTHORS b/scripts/pybootchartgui/AUTHORS
new file mode 100644
index 0000000000..45bd1ac823
--- /dev/null
+++ b/scripts/pybootchartgui/AUTHORS
@@ -0,0 +1,11 @@
+Anders Norgaard <anders.norgaard@gmail.com>
+Henning Niss <henningniss@gmail.com>
+
+
+
+Contributors:
+Brian Ewins
+
+
+Based on work by:
+Ziga Mahkovec
diff --git a/scripts/pybootchartgui/COPYING b/scripts/pybootchartgui/COPYING
new file mode 100644
index 0000000000..94a9ed024d
--- /dev/null
+++ b/scripts/pybootchartgui/COPYING
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program 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 <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/scripts/pybootchartgui/README b/scripts/pybootchartgui/README
new file mode 100644
index 0000000000..1b97c442f3
--- /dev/null
+++ b/scripts/pybootchartgui/README
@@ -0,0 +1,36 @@
+                            PYBOOTCHARTGUI
+                           ----------------
+
+pybootchartgui is a tool for visualization and analysis of the
+GNU/Linux boot process. It renders the output of the boot-logger tool
+bootchart (see http://www.bootchart.org/) to either the screen or
+files of various formats. Bootchart collects information about the
+processes, their dependencies, and resource consumption during boot of
+a GNU/Linux system. The pybootchartgui tools visualizes the process
+tree and overall resource utilization.
+
+pybootchartgui is a port of the visualization part of bootchart from
+Java to Python and Cairo.
+
+Adapted from the bootchart-documentation:
+
+  The CPU and disk statistics are used to render stacked area and line
+  charts. The process information is used to create a Gantt chart
+  showing process dependency, states and CPU usage.
+
+  A typical boot sequence consists of several hundred processes. Since
+  it is difficult to visualize such amount of data in a comprehensible
+  way, tree pruning is utilized. Idle background processes and
+  short-lived processes are removed. Similar processes running in
+  parallel are also merged together.
+
+  Finally, the performance and dependency charts are rendered as a
+  single image to either the screen or in PNG, PDF or SVG format.
+
+
+To get help for pybootchartgui, run
+
+$ pybootchartgui --help
+
+
+http://code.google.com/p/pybootchartgui/
diff --git a/scripts/pybootchartgui/pybootchartgui.py b/scripts/pybootchartgui/pybootchartgui.py
new file mode 100755
index 0000000000..f301027805
--- /dev/null
+++ b/scripts/pybootchartgui/pybootchartgui.py
@@ -0,0 +1,7 @@
+#!/usr/bin/python
+
+import sys
+from pybootchartgui.main import main
+
+if __name__ == '__main__':
+        sys.exit(main())
diff --git a/scripts/pybootchartgui/pybootchartgui/__init__.py b/scripts/pybootchartgui/pybootchartgui/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/scripts/pybootchartgui/pybootchartgui/__init__.py
diff --git a/scripts/pybootchartgui/pybootchartgui/batch.py b/scripts/pybootchartgui/pybootchartgui/batch.py
new file mode 100644
index 0000000000..bd67c9350e
--- /dev/null
+++ b/scripts/pybootchartgui/pybootchartgui/batch.py
@@ -0,0 +1,23 @@
+import cairo
+
+import draw
+
+def render(res, format, filename):
+    handlers = {
+        "png": (lambda w,h: cairo.ImageSurface(cairo.FORMAT_ARGB32,w,h), lambda sfc: sfc.write_to_png(filename)),
+        "pdf": (lambda w,h: cairo.PDFSurface(filename, w, h), lambda sfc: 0),
+        "svg": (lambda w,h: cairo.SVGSurface(filename, w, h), lambda sfc: 0)
+    }
+
+    if not(handlers.has_key(format)):
+        print "Unknown format '%s'." % format
+        return 10
+
+    make_surface, write_surface = handlers[format]
+    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)
+    write_surface(surface)
+
diff --git a/scripts/pybootchartgui/pybootchartgui/draw.py b/scripts/pybootchartgui/pybootchartgui/draw.py
new file mode 100644
index 0000000000..249cd2ef81
--- /dev/null
+++ b/scripts/pybootchartgui/pybootchartgui/draw.py
@@ -0,0 +1,355 @@
+import cairo
+import math
+import re
+
+# Process tree background color.
+BACK_COLOR = (1.0, 1.0, 1.0, 1.0)
+
+WHITE = (1.0, 1.0, 1.0, 1.0)
+# Process tree border color.
+BORDER_COLOR = (0.63, 0.63, 0.63, 1.0)
+# Second tick line color.
+TICK_COLOR = (0.92, 0.92, 0.92, 1.0)
+# 5-second tick line color.
+TICK_COLOR_BOLD = (0.86, 0.86, 0.86, 1.0)
+# Text color.
+TEXT_COLOR = (0.0, 0.0, 0.0, 1.0)
+
+# Font family
+FONT_NAME = "Bitstream Vera Sans"       
+# Title text font.
+TITLE_FONT_SIZE = 18
+# Default text font.
+TEXT_FONT_SIZE = 12
+# Axis label font.
+AXIS_FONT_SIZE = 11
+# Legend font.
+LEGEND_FONT_SIZE = 12
+        
+# CPU load chart color.
+CPU_COLOR = (0.40, 0.55, 0.70, 1.0)
+# IO wait chart color.
+IO_COLOR = (0.76, 0.48, 0.48, 0.5)
+# Disk throughput color.
+DISK_TPUT_COLOR = (0.20, 0.71, 0.20, 1.0)
+# CPU load chart color.
+FILE_OPEN_COLOR = (0.20, 0.71, 0.71, 1.0)
+        
+# Process border color.
+PROC_BORDER_COLOR = (0.71, 0.71, 0.71, 1.0)
+# Waiting process color.
+PROC_COLOR_D = (0.76, 0.48, 0.48, 0.125)
+# Running process color.
+PROC_COLOR_R = CPU_COLOR
+# Sleeping process color.
+PROC_COLOR_S = (0.94, 0.94, 0.94, 1.0)
+# Stopped process color.
+PROC_COLOR_T = (0.94, 0.50, 0.50, 1.0)
+# Zombie process color.
+PROC_COLOR_Z = (0.71, 0.71, 0.71, 1.0)
+# Dead process color.
+PROC_COLOR_X = (0.71, 0.71, 0.71, 0.125)
+# Paging process color.
+PROC_COLOR_W = (0.71, 0.71, 0.71, 0.125)
+
+# Process label color.
+PROC_TEXT_COLOR = (0.19, 0.19, 0.19, 1.0)
+# Process label font.
+PROC_TEXT_FONT_SIZE = 12
+
+# Signature color.
+SIG_COLOR = (0.0, 0.0, 0.0, 0.3125)
+# Signature font.
+SIG_FONT_SIZE = 14
+# Signature text.
+SIGNATURE = "http://code.google.com/p/pybootchartgui"
+        
+# Process dependency line color.
+DEP_COLOR = (0.75, 0.75, 0.75, 1.0)
+# Process dependency line stroke.
+DEP_STROKE = 1.0
+
+# Process description date format.
+DESC_TIME_FORMAT = "mm:ss.SSS"
+
+# Process states
+STATE_UNDEFINED = 0
+STATE_RUNNING   = 1
+STATE_SLEEPING  = 2
+STATE_WAITING   = 3
+STATE_STOPPED   = 4
+STATE_ZOMBIE    = 5
+
+STATE_COLORS = [(0,0,0,0), PROC_COLOR_R, PROC_COLOR_S, PROC_COLOR_D, PROC_COLOR_T, PROC_COLOR_Z, PROC_COLOR_X, PROC_COLOR_W]
+
+# Convert ps process state to an int
+def get_proc_state(flag):
+        return "RSDTZXW".index(flag) + 1
+        
+
+def draw_text(ctx, text, color, x, y):
+        ctx.set_source_rgba(*color)
+        ctx.move_to(x, y)
+        ctx.show_text(text)
+        
+        
+def draw_fill_rect(ctx, color, rect):
+        ctx.set_source_rgba(*color)
+        ctx.rectangle(*rect)
+        ctx.fill()
+        
+
+def draw_rect(ctx, color, rect):
+        ctx.set_source_rgba(*color)
+        ctx.rectangle(*rect)
+        ctx.stroke()
+        
+        
+def draw_legend_box(ctx, label, fill_color, x, y, s):
+        draw_fill_rect(ctx, fill_color, (x, y - s, s, s))
+        draw_rect(ctx, PROC_BORDER_COLOR, (x, y - s, s, s))
+        draw_text(ctx, label, TEXT_COLOR, x + s + 5, y)
+        
+     
+def draw_legend_line(ctx, label, fill_color, x, y, s):
+        draw_fill_rect(ctx, fill_color, (x, y - s/2, s + 1, 3))    
+        ctx.arc(x + (s + 1)/2.0, y - (s - 3)/2.0, 2.5, 0, 2.0 * math.pi)
+        ctx.fill()
+        draw_text(ctx, label, TEXT_COLOR, x + s + 5, y)
+        
+
+def draw_label_in_box(ctx, color, label, x, y, w, maxx):
+        label_w = ctx.text_extents(label)[2]
+        label_x = x + w / 2 - label_w / 2
+        if label_w + 10 > w:
+            label_x = x + w + 5
+        if label_x + label_w > maxx:
+            label_x = x - label_w - 5
+        draw_text(ctx, label, color, label_x, y)
+
+
+def draw_5sec_labels(ctx, rect, sec_w):
+        ctx.set_font_size(AXIS_FONT_SIZE)
+        for i in range(0, rect[2] + 1, sec_w):
+                if ((i / sec_w) % 5 == 0) :
+                        label = "%ds" % (i / sec_w)
+                        label_w = ctx.text_extents(label)[2]
+                        draw_text(ctx, label, TEXT_COLOR, rect[0] + i - label_w/2, rect[1] - 2)
+
+
+def draw_box_ticks(ctx, rect, sec_w):
+        draw_rect(ctx, BORDER_COLOR, tuple(rect))
+        
+        ctx.set_line_cap(cairo.LINE_CAP_SQUARE)
+
+        for i in range(sec_w, rect[2] + 1, sec_w):
+                if ((i / sec_w) % 5 == 0) :
+                        ctx.set_source_rgba(*TICK_COLOR_BOLD)
+                else :
+                        ctx.set_source_rgba(*TICK_COLOR)
+                ctx.move_to(rect[0] + i, rect[1] + 1)
+                ctx.line_to(rect[0] + i, rect[1] + rect[3] - 1)
+                ctx.stroke()
+
+        ctx.set_line_cap(cairo.LINE_CAP_BUTT)
+
+def draw_chart(ctx, color, fill, chart_bounds, data, proc_tree):
+        ctx.set_line_width(0.5)
+        x_shift = proc_tree.start_time
+        x_scale = proc_tree.duration
+    
+        def transform_point_coords(point, x_base, y_base, xscale, yscale, x_trans, y_trans):
+                x = (point[0] - x_base) * xscale + x_trans
+                y = (point[1] - y_base) * -yscale + y_trans + bar_h
+                return x, y
+
+        xscale = float(chart_bounds[2]) / max(x for (x,y) in data)
+        yscale = float(chart_bounds[3]) / max(y for (x,y) in data)
+    
+        first = transform_point_coords(data[0], x_shift, 0, xscale, yscale, chart_bounds[0], chart_bounds[1])
+        last = transform_point_coords(data[-1], x_shift, 0, xscale, yscale, chart_bounds[0], chart_bounds[1])
+    
+        ctx.set_source_rgba(*color)
+        ctx.move_to(*first)
+        for point in data:
+                x, y = transform_point_coords(point, x_shift, 0, xscale, yscale, chart_bounds[0], chart_bounds[1])
+                ctx.line_to(x, y)
+        if fill:
+                ctx.stroke_preserve()
+                ctx.line_to(last[0], chart_bounds[1]+bar_h)
+                ctx.line_to(first[0], chart_bounds[1]+bar_h)
+                ctx.line_to(first[0], first[1])
+                ctx.fill()
+        else:
+                ctx.stroke()
+        ctx.set_line_width(1.0)
+
+header_h = 280
+bar_h = 55
+# offsets
+off_x, off_y = 10, 10
+sec_w = 25 # the width of a second
+proc_h = 16 # the height of a process
+leg_s = 10
+MIN_IMG_W = 800
+
+
+def extents(headers, cpu_stats, disk_stats, proc_tree):
+        w = (proc_tree.duration * sec_w / 100) + 2*off_x
+        h = proc_h * proc_tree.num_proc + header_h + 2*off_y
+        return (w,h)
+
+#
+# Render the chart.
+# 
+def render(ctx, headers, cpu_stats, disk_stats, proc_tree):
+        (w, h) = extents(headers, cpu_stats, disk_stats, proc_tree)
+
+        ctx.set_line_width(1.0)
+        ctx.select_font_face(FONT_NAME)
+        draw_fill_rect(ctx, WHITE, (0, 0, max(w, MIN_IMG_W), h))
+        w -= 2*off_x    
+        # draw the title and headers
+        curr_y = draw_header(ctx, headers, off_x, proc_tree.duration)
+    
+        # render bar legend
+        ctx.set_font_size(LEGEND_FONT_SIZE)
+
+        draw_legend_box(ctx, "CPU (user+sys)", CPU_COLOR, off_x, curr_y+20, leg_s)
+        draw_legend_box(ctx, "I/O (wait)", IO_COLOR, off_x + 120, curr_y+20, leg_s)
+
+        # render I/O wait
+        chart_rect = (off_x, curr_y+30, w, bar_h)
+        draw_box_ticks(ctx, chart_rect, sec_w)
+        draw_chart(ctx, IO_COLOR, True, chart_rect, [(sample.time, sample.user + sample.sys + sample.io) for sample in cpu_stats], proc_tree) 
+        # render CPU load
+        draw_chart(ctx, CPU_COLOR, True, chart_rect, [(sample.time, sample.user + sample.sys) for sample in cpu_stats], proc_tree)
+
+        curr_y = curr_y + 30 + bar_h
+
+        # render second chart
+        draw_legend_line(ctx, "Disk throughput", DISK_TPUT_COLOR, off_x, curr_y+20, leg_s)
+        draw_legend_box(ctx, "Disk utilization", IO_COLOR, off_x + 120, curr_y+20, leg_s)
+
+        # render I/O utilization
+        chart_rect = (off_x, curr_y+30, w, bar_h)
+        draw_box_ticks(ctx, chart_rect, sec_w)                  
+        draw_chart(ctx, IO_COLOR, True, chart_rect, [(sample.time, sample.util) for sample in disk_stats], proc_tree)
+                                
+        # render disk throughput
+        max_sample = max(disk_stats, key=lambda s: s.tput)
+        draw_chart(ctx, DISK_TPUT_COLOR, False, chart_rect, [(sample.time, sample.tput) for sample in disk_stats], proc_tree)
+        
+        pos_x = off_x + ((max_sample.time - proc_tree.start_time) * w / proc_tree.duration)
+
+        shift_x, shift_y = -20, 20
+        if (pos_x < off_x + 245):
+                shift_x, shift_y = 5, 40
+                                
+        label = "%dMB/s" % round((max_sample.tput) / 1024.0)
+        draw_text(ctx, label, DISK_TPUT_COLOR, pos_x + shift_x, curr_y + shift_y)
+
+
+        # draw process boxes
+        draw_process_bar_chart(ctx, proc_tree, curr_y + bar_h, w, h)
+
+        ctx.set_font_size(SIG_FONT_SIZE)
+        draw_text(ctx, SIGNATURE, SIG_COLOR, off_x + 5, h - off_y - 5)
+        
+def draw_process_bar_chart(ctx, proc_tree, curr_y, w, h):
+        draw_legend_box(ctx, "Running (%cpu)",          PROC_COLOR_R, off_x    , curr_y + 45, leg_s)            
+        draw_legend_box(ctx, "Unint.sleep (I/O)",       PROC_COLOR_D, off_x+120, curr_y + 45, leg_s)
+        draw_legend_box(ctx, "Sleeping",                PROC_COLOR_S, off_x+240, curr_y + 45, leg_s)
+        draw_legend_box(ctx, "Zombie",                  PROC_COLOR_Z, off_x+360, curr_y + 45, leg_s)
+        
+        chart_rect = [off_x, curr_y+60, w, h - 2 * off_y - (curr_y+60) + proc_h]
+        ctx.set_font_size(PROC_TEXT_FONT_SIZE)
+        
+        draw_box_ticks(ctx, chart_rect, sec_w)
+        draw_5sec_labels(ctx, chart_rect, sec_w)
+        
+        y = curr_y+60
+        for root in proc_tree.process_tree:        
+                draw_processes_recursively(ctx, root, proc_tree, y, proc_h, chart_rect)
+                y  = y + proc_h * proc_tree.num_nodes([root])
+
+
+def draw_header(ctx, headers, off_x, duration):
+    dur = duration / 100.0
+    toshow = [
+      ('system.uname', 'uname', lambda s: s),
+      ('system.release', 'release', lambda s: s),
+      ('system.cpu', 'CPU', lambda s: re.sub('model name\s*:\s*', '', s, 1)),
+      ('system.kernel.options', 'kernel options', lambda s: s),
+      ('pseudo.header', 'time', lambda s: '%02d:%05.2f' % (math.floor(dur/60), dur - 60 * math.floor(dur/60)))
+    ]
+
+    header_y = ctx.font_extents()[2] + 10
+    ctx.set_font_size(TITLE_FONT_SIZE)
+    draw_text(ctx, headers['title'], TEXT_COLOR, off_x, header_y)
+    ctx.set_font_size(TEXT_FONT_SIZE)
+        
+    for (headerkey, headertitle, mangle) in toshow:
+        header_y += ctx.font_extents()[2]
+        txt = headertitle + ': ' + mangle(headers.get(headerkey))
+        draw_text(ctx, txt, TEXT_COLOR, off_x, header_y)
+
+    return header_y
+
+def draw_processes_recursively(ctx, proc, proc_tree, y, proc_h, rect) :
+        x = rect[0] +  ((proc.start_time - proc_tree.start_time) * rect[2] / proc_tree.duration)
+        w = ((proc.duration) * rect[2] / proc_tree.duration)
+
+        draw_process_activity_colors(ctx, proc, proc_tree, x, y, w, proc_h, rect)
+        draw_rect(ctx, PROC_BORDER_COLOR, (x, y, w, proc_h))
+        draw_label_in_box(ctx, PROC_TEXT_COLOR, proc.cmd, x, y + proc_h - 4, w, rect[0] + rect[2])
+
+        next_y = y + proc_h
+        for child in proc.child_list:
+                child_x, child_y = draw_processes_recursively(ctx, child, proc_tree, next_y, proc_h, rect)
+                draw_process_connecting_lines(ctx, x, y, child_x, child_y, proc_h)
+                next_y = next_y + proc_h * proc_tree.num_nodes([child])
+                
+        return x, y
+
+
+def draw_process_activity_colors(ctx, proc, proc_tree, x, y, w, proc_h, rect):
+        draw_fill_rect(ctx, PROC_COLOR_S, (x, y, w, proc_h))
+
+        last_tx = -1
+        for sample in proc.samples :    
+                tx = rect[0] + round(((sample.time - proc_tree.start_time) * rect[2] / proc_tree.duration))
+                tw = round(proc_tree.sample_period * rect[2] / float(proc_tree.duration))
+                if last_tx != -1 and abs(last_tx - tx) <= tw:
+                        tw -= last_tx - tx
+                        tx = last_tx
+             
+                last_tx = tx + tw
+                state = get_proc_state( sample.state )
+
+                color = STATE_COLORS[state]        
+                if state == STATE_RUNNING:
+                        alpha = sample.cpu_sample.user + sample.cpu_sample.sys
+                        color = tuple(list(PROC_COLOR_R[0:3]) + [alpha])
+                elif state == STATE_SLEEPING:
+                        continue
+
+                draw_fill_rect(ctx, color, (tx, y, tw, proc_h))
+
+    
+def draw_process_connecting_lines(ctx, px, py, x, y, proc_h):
+        ctx.set_source_rgba(*DEP_COLOR)
+        ctx.set_dash([2,2])
+        if abs(px - x) < 3:
+                dep_off_x = 3
+                dep_off_y = proc_h / 4
+                ctx.move_to(x, y + proc_h / 2)
+                ctx.line_to(px - dep_off_x, y + proc_h / 2)
+                ctx.line_to(px - dep_off_x, py - dep_off_y)
+                ctx.line_to(px, py - dep_off_y)         
+        else:
+                ctx.move_to(x, y + proc_h / 2)
+                ctx.line_to(px, y + proc_h / 2)
+                ctx.line_to(px, py)
+        ctx.stroke()
+        ctx.set_dash([])
diff --git a/scripts/pybootchartgui/pybootchartgui/gui.py b/scripts/pybootchartgui/pybootchartgui/gui.py
new file mode 100644
index 0000000000..87081e30eb
--- /dev/null
+++ b/scripts/pybootchartgui/pybootchartgui/gui.py
@@ -0,0 +1,273 @@
+import gobject
+import gtk
+import gtk.gdk
+import gtk.keysyms
+
+import draw
+
+class PyBootchartWidget(gtk.DrawingArea):
+        __gsignals__ = {
+                'expose-event': 'override',
+                'clicked' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_STRING, gtk.gdk.Event)),
+                'position-changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_INT, gobject.TYPE_INT)),
+                'set-scroll-adjustments' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gtk.Adjustment, gtk.Adjustment))
+        }
+
+        def __init__(self, res):
+                gtk.DrawingArea.__init__(self)
+
+                self.res = res
+
+                self.set_flags(gtk.CAN_FOCUS)
+
+                self.add_events(gtk.gdk.BUTTON_PRESS_MASK | gtk.gdk.BUTTON_RELEASE_MASK)
+                self.connect("button-press-event", self.on_area_button_press)
+                self.connect("button-release-event", self.on_area_button_release)
+                self.add_events(gtk.gdk.POINTER_MOTION_MASK | gtk.gdk.POINTER_MOTION_HINT_MASK | gtk.gdk.BUTTON_RELEASE_MASK)
+                self.connect("motion-notify-event", self.on_area_motion_notify)
+                self.connect("scroll-event", self.on_area_scroll_event)
+                self.connect('key-press-event', self.on_key_press_event)
+
+                self.connect('set-scroll-adjustments', self.on_set_scroll_adjustments)
+                self.connect("size-allocate", self.on_allocation_size_changed)
+                self.connect("position-changed", self.on_position_changed)
+
+                self.zoom_ratio = 1.0
+                self.x, self.y = 0.0, 0.0
+
+                self.chart_width, self.chart_height = draw.extents(*res)
+                self.hadj = None
+                self.vadj = None
+
+        def do_expose_event(self, event):
+                cr = self.window.cairo_create()
+
+                # set a clip region for the expose event
+                cr.rectangle(
+                        event.area.x, event.area.y,
+                        event.area.width, event.area.height
+                )
+                cr.clip()
+                self.draw(cr, self.get_allocation())
+                return False
+                
+        def draw(self, cr, rect):       
+                cr.set_source_rgba(1.0, 1.0, 1.0, 1.0)
+                cr.paint()
+                cr.scale(self.zoom_ratio, self.zoom_ratio)
+                cr.translate(-self.x, -self.y)
+                draw.render(cr, *self.res)
+
+        def position_changed(self):
+                self.emit("position-changed", self.x, self.y)
+
+        ZOOM_INCREMENT = 1.25
+
+        def zoom_image(self, zoom_ratio):
+            self.zoom_ratio = zoom_ratio
+            self._set_scroll_adjustments(self.hadj, self.vadj)
+            self.queue_draw()
+
+        def zoom_to_rect(self, rect):
+            zoom_ratio = float(rect.width)/float(self.chart_width)
+            self.zoom_image(zoom_ratio)
+            self.x = 0
+            self.position_changed()
+
+        def on_zoom_in(self, action):
+            self.zoom_image(self.zoom_ratio * self.ZOOM_INCREMENT)
+
+        def on_zoom_out(self, action):
+            self.zoom_image(self.zoom_ratio / self.ZOOM_INCREMENT)
+
+        def on_zoom_fit(self, action):          
+            self.zoom_to_rect(self.get_allocation())
+
+        def on_zoom_100(self, action):
+            self.zoom_image(1.0)
+
+        POS_INCREMENT = 100
+
+        def on_key_press_event(self, widget, event):
+                if event.keyval == gtk.keysyms.Left:
+                        self.x -= self.POS_INCREMENT/self.zoom_ratio
+                elif event.keyval == gtk.keysyms.Right:
+                        self.x += self.POS_INCREMENT/self.zoom_ratio
+                elif event.keyval == gtk.keysyms.Up:
+                        self.y -= self.POS_INCREMENT/self.zoom_ratio
+                elif event.keyval == gtk.keysyms.Down:
+                        self.y += self.POS_INCREMENT/self.zoom_ratio
+                elif event.keyval == gtk.keysyms.Page_Up:
+                        self.zoom_image(self.zoom_ratio * self.ZOOM_INCREMENT)
+                elif event.keyval == gtk.keysyms.Page_Down:
+                        self.zoom_image(self.zoom_ratio / self.ZOOM_INCREMENT)
+                else:
+                        return False                
+                self.queue_draw()
+                self.position_changed()
+                return True
+
+        def on_area_button_press(self, area, event):
+                if event.button == 2 or event.button == 1:
+                        area.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.FLEUR))
+                        self.prevmousex = event.x
+                        self.prevmousey = event.y
+                if event.type not in (gtk.gdk.BUTTON_PRESS, gtk.gdk.BUTTON_RELEASE):
+                        return False
+                return False
+
+        def on_area_button_release(self, area, event):
+                if event.button == 2 or event.button == 1:
+                        area.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.ARROW))
+                        self.prevmousex = None
+                        self.prevmousey = None
+                        return True
+                return False
+
+        def on_area_scroll_event(self, area, event):
+                if event.direction == gtk.gdk.SCROLL_UP:
+                        self.zoom_image(self.zoom_ratio * self.ZOOM_INCREMENT)
+                        return True
+                if event.direction == gtk.gdk.SCROLL_DOWN:
+                        self.zoom_image(self.zoom_ratio / self.ZOOM_INCREMENT)
+                        return True
+                return False
+
+        def on_area_motion_notify(self, area, event):
+                state = event.state
+                if state & gtk.gdk.BUTTON2_MASK or state & gtk.gdk.BUTTON1_MASK:
+                        x, y = int(event.x), int(event.y)
+                        # pan the image
+                        self.x += (self.prevmousex - x)/self.zoom_ratio
+                        self.y += (self.prevmousey - y)/self.zoom_ratio
+                        self.queue_draw()
+                        self.prevmousex = x
+                        self.prevmousey = y
+                        self.position_changed()
+                return True
+
+        def on_set_scroll_adjustments(self, area, hadj, vadj):
+                self._set_scroll_adjustments(hadj, vadj)
+
+        def on_allocation_size_changed(self, widget, allocation):
+                self.hadj.page_size = allocation.width
+                self.hadj.page_increment = allocation.width * 0.9
+                self.vadj.page_size = allocation.height
+                self.vadj.page_increment = allocation.height * 0.9
+
+        def _set_scroll_adjustments(self, hadj, vadj):
+                if hadj == None:
+                        hadj = gtk.Adjustment(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)
+                if vadj == None:
+                        vadj = gtk.Adjustment(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)
+                        
+                if self.hadj != None and hadj != self.hadj:
+                        self.hadj.disconnect(self.hadj_changed_signal_id)
+                if self.vadj != None and vadj != self.vadj:
+                        self.vadj.disconnect(self.vadj_changed_signal_id)
+
+                if hadj != None:
+                        self.hadj = hadj
+                        self._set_adj_upper(self.hadj, self.zoom_ratio * self.chart_width)
+                        self.hadj_changed_signal_id = self.hadj.connect('value-changed', self.on_adjustments_changed)
+
+                if vadj != None:
+                        self.vadj = vadj
+                        self._set_adj_upper(self.vadj, self.zoom_ratio * self.chart_height)
+                        self.vadj_changed_signal_id = self.vadj.connect('value-changed', self.on_adjustments_changed)
+
+        def _set_adj_upper(self, adj, upper):
+                changed = False
+                value_changed = False
+
+                if adj.upper != upper:
+                        adj.upper = upper
+                        changed = True
+
+                max_value = max(0.0, upper - adj.page_size)
+                if adj.value > max_value:
+                        adj.value = max_value
+                        value_changed = True
+
+                if changed:
+                        adj.changed()
+                if value_changed:
+                        adj.value_changed()
+
+        def on_adjustments_changed(self, adj):
+                self.x = self.hadj.value / self.zoom_ratio
+                self.y = self.vadj.value / self.zoom_ratio
+                self.queue_draw()
+
+        def on_position_changed(self, widget, x, y):
+                self.hadj.value = x * self.zoom_ratio
+                self.vadj.value = y * self.zoom_ratio
+
+PyBootchartWidget.set_set_scroll_adjustments_signal('set-scroll-adjustments')
+
+class PyBootchartWindow(gtk.Window):
+
+        ui = '''
+        <ui>
+                <toolbar name="ToolBar">
+                        <toolitem action="ZoomIn"/>
+                        <toolitem action="ZoomOut"/>
+                        <toolitem action="ZoomFit"/>
+                        <toolitem action="Zoom100"/>
+                </toolbar>
+        </ui>
+        '''
+
+        def __init__(self, res):
+                gtk.Window.__init__(self)
+
+                window = self
+                window.set_title('Bootchart')
+                window.set_default_size(512, 512)
+                vbox = gtk.VBox()
+                window.add(vbox)
+
+                self.widget = PyBootchartWidget(res)
+
+                # Create a UIManager instance
+                uimanager = self.uimanager = gtk.UIManager()
+                
+                # Add the accelerator group to the toplevel window
+                accelgroup = uimanager.get_accel_group()
+                window.add_accel_group(accelgroup)
+
+                # Create an ActionGroup
+                actiongroup = gtk.ActionGroup('Actions')
+                self.actiongroup = actiongroup
+
+                # Create actions
+                actiongroup.add_actions((
+                        ('ZoomIn', gtk.STOCK_ZOOM_IN, None, None, None, self.widget.on_zoom_in),
+                        ('ZoomOut', gtk.STOCK_ZOOM_OUT, None, None, None, self.widget.on_zoom_out),
+                        ('ZoomFit', gtk.STOCK_ZOOM_FIT, 'Fit Width', None, None, self.widget.on_zoom_fit),
+                        ('Zoom100', gtk.STOCK_ZOOM_100, None, None, None, self.widget.on_zoom_100),
+                ))
+
+                # Add the actiongroup to the uimanager
+                uimanager.insert_action_group(actiongroup, 0)
+
+                # Add a UI description
+                uimanager.add_ui_from_string(self.ui)
+
+                # Scrolled window
+                scrolled = gtk.ScrolledWindow()
+                scrolled.add(self.widget)
+
+                # Create a Toolbar
+                toolbar = uimanager.get_widget('/ToolBar')
+                vbox.pack_start(toolbar, False)
+                vbox.pack_start(scrolled)
+
+                self.set_focus(self.widget)
+
+                self.show_all()
+
+def show(res):
+        win = PyBootchartWindow(res)
+        win.connect('destroy', gtk.main_quit)
+        gtk.main()
diff --git a/scripts/pybootchartgui/pybootchartgui/main.py b/scripts/pybootchartgui/pybootchartgui/main.py
new file mode 100644
index 0000000000..bf50afb6c3
--- /dev/null
+++ b/scripts/pybootchartgui/pybootchartgui/main.py
@@ -0,0 +1,71 @@
+import sys
+import os
+import optparse
+
+import parsing
+import gui
+import batch
+
+def _mk_options_parser():
+        """Make an options parser."""
+        usage = "%prog [options] PATH, ..., PATH"
+        version = "%prog v0.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("-o", "--output", dest="output", metavar="PATH", default=None,
+                          help="output path (file or directory) where charts are stored")
+        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,
+                          help="suppress informational messages")
+        parser.add_option("--very-quiet", action="store_true", dest="veryquiet", default=False,
+                          help="suppress all messages except errors")
+        parser.add_option("--verbose", action="store_true", dest="verbose", default=False,
+                          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 = ""
+        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)
+
+def main(argv=None):
+        try:
+                if argv is None:
+                        argv = sys.argv[1:]
+        
+                parser = _mk_options_parser()
+                options, args = parser.parse_args(argv)
+        
+                if len(args) == 0:
+                        parser.error("insufficient arguments, expected at least one path.")
+                        return 2
+
+                res = parsing.parse(args, options.prune)
+                if options.interactive or options.format == None:
+                        gui.show(res)
+                else:
+                        filename = _get_filename(args, options)
+                        batch.render(res, options.format, filename)
+                        print "bootchart written to", filename
+                return 0
+        except parsing.ParseError, ex:
+                print("Parse error: %s" % ex)
+                return 2
+
+
+if __name__ == '__main__':
+        sys.exit(main())
diff --git a/scripts/pybootchartgui/pybootchartgui/parsing.py b/scripts/pybootchartgui/pybootchartgui/parsing.py
new file mode 100644
index 0000000000..a350a3eb08
--- /dev/null
+++ b/scripts/pybootchartgui/pybootchartgui/parsing.py
@@ -0,0 +1,223 @@
+from __future__ import with_statement
+
+import os
+import string
+import re
+import tarfile
+from collections import defaultdict
+
+from samples import *
+from process_tree import ProcessTree
+
+class ParseError(Exception):
+        """Represents errors during parse of the bootchart."""
+        def __init__(self, value):
+            self.value = value
+
+        def __str__(self):
+            return self.value
+
+def _parse_headers(file):
+        """Parses the headers of the bootchart."""
+        def parse((headers,last), line): 
+            if '=' in line: last,value = map(string.strip, line.split('=', 1))
+            else:           value = line.strip()
+            headers[last] += value
+            return headers,last
+        return reduce(parse, file.read().split('\n'), (defaultdict(str),''))[0]
+
+def _parse_timed_blocks(file):
+        """Parses (ie., splits) a file into so-called timed-blocks. A
+        timed-block consists of a timestamp on a line by itself followed
+        by zero or more lines of data for that point in time."""
+        def parse(block):
+            lines = block.split('\n')
+            if not lines:
+                raise ParseError('expected a timed-block consisting a timestamp followed by data lines')
+            try:
+                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().split('\n\n')
+        return [parse(block) for block in blocks if block.strip()]
+        
+def _parse_proc_ps_log(file):
+        """
+         * See proc(5) for details.
+         * 
+         * {pid, comm, state, ppid, pgrp, session, tty_nr, tpgid, flags, minflt, cminflt, majflt, cmajflt, utime, stime,
+         *  cutime, cstime, priority, nice, 0, itrealvalue, starttime, vsize, rss, rlim, startcode, endcode, startstack, 
+         *  kstkesp, kstkeip}
+        """
+        processMap = {}
+        ltime = 0
+        timed_blocks = _parse_timed_blocks(file)
+        for time, lines in timed_blocks:
+                for line in lines:
+                        tokens = line.split(' ')
+
+                        offset = [index for index, token in enumerate(tokens[1:]) if token.endswith(')')][0]            
+                        pid, cmd, state, ppid = int(tokens[0]), ' '.join(tokens[1:2+offset]), tokens[2+offset], int(tokens[3+offset])
+                        userCpu, sysCpu, stime= int(tokens[13+offset]), int(tokens[14+offset]), int(tokens[21+offset])
+
+                        if processMap.has_key(pid):
+                                process = processMap[pid]
+                                process.cmd = cmd.replace('(', '').replace(')', '') # why rename after latest name??
+                        else:
+                                process = Process(pid, cmd, ppid, min(time, stime))
+                                processMap[pid] = process
+                        
+                        if process.last_user_cpu_time is not None and process.last_sys_cpu_time is not None and ltime is not None:
+                                userCpuLoad, sysCpuLoad = process.calc_load(userCpu, sysCpu, time - ltime)
+                                cpuSample = CPUSample('null', userCpuLoad, sysCpuLoad, 0.0)
+                                process.samples.append(ProcessSample(time, state, cpuSample))
+                        
+                        process.last_user_cpu_time = userCpu
+                        process.last_sys_cpu_time = sysCpu
+                ltime = time
+
+        startTime = timed_blocks[0][0]
+        avgSampleLength = (ltime - startTime)/(len(timed_blocks)-1)     
+
+        for process in processMap.values():
+                process.set_parent(processMap)
+
+        for process in processMap.values():
+                process.calc_stats(avgSampleLength)
+                
+        return ProcessStats(processMap.values(), avgSampleLength, startTime, ltime)
+        
+def _parse_proc_stat_log(file):
+        samples = []
+        ltimes = None
+        for time, lines in _parse_timed_blocks(file):
+                # CPU times {user, nice, system, idle, io_wait, irq, softirq}           
+                tokens = lines[0].split();
+                times = [ int(token) for token in tokens[1:] ]
+                if ltimes:
+                        user = float((times[0] + times[1]) - (ltimes[0] + ltimes[1]))
+                        system = float((times[2] + times[5] + times[6]) - (ltimes[2] + ltimes[5] + ltimes[6]))
+                        idle = float(times[3] - ltimes[3])
+                        iowait = float(times[4] - ltimes[4])
+                        
+                        aSum = max(user + system + idle + iowait, 1)
+                        samples.append( CPUSample(time, user/aSum, system/aSum, iowait/aSum) )
+                
+                ltimes = times          
+                # skip the rest of statistics lines
+        return samples
+
+                
+def _parse_proc_disk_stat_log(file, numCpu):
+        """
+        Parse file for disk stats, but only look at the whole disks, eg. sda,
+        not sda1, sda2 etc. The format of relevant lines should be:
+        {major minor name rio rmerge rsect ruse wio wmerge wsect wuse running use aveq}
+        """
+        DISK_REGEX = 'hd.$|sd.$'
+        
+        def is_relevant_line(line):
+                return len(line.split()) == 14 and re.match(DISK_REGEX, line.split()[2])
+        
+        disk_stat_samples = []
+
+        for time, lines in _parse_timed_blocks(file):
+                sample = DiskStatSample(time)           
+                relevant_tokens = [line.split() for line in lines if is_relevant_line(line)]
+                
+                for tokens in relevant_tokens:                  
+                        disk, rsect, wsect, use = tokens[2], int(tokens[5]), int(tokens[9]), int(tokens[12])                    
+                        sample.add_diskdata([rsect, wsect, use])
+                
+                disk_stat_samples.append(sample)
+                        
+        disk_stats = []
+        for sample1, sample2 in zip(disk_stat_samples[:-1], disk_stat_samples[1:]):
+                interval = sample1.time - sample2.time
+                sums = [ a - b for a, b in zip(sample1.diskdata, sample2.diskdata) ]
+                readTput = sums[0] / 2.0 * 100.0 / interval
+                writeTput = sums[1] / 2.0 * 100.0 / interval                    
+                util = float( sums[2] ) / 10 / interval / numCpu
+                util = max(0.0, min(1.0, util))
+                disk_stats.append(DiskSample(sample2.time, readTput, writeTput, util))
+        
+        return disk_stats
+        
+        
+def get_num_cpus(headers):
+    """Get the number of CPUs from the system.cpu header property. As the
+    CPU utilization graphs are relative, the number of CPUs currently makes
+    no difference."""
+    if headers is None:
+        return 1
+    cpu_model = headers.get("system.cpu")
+    if cpu_model is None:
+        return 1
+    mat = re.match(".*\\((\\d+)\\)", cpu_model)
+    if mat is None:
+        return 1
+    return int(mat.group(1))
+
+class ParserState:
+    def __init__(self):
+        self.headers = None
+        self.disk_stats = None
+        self.ps_stats = None
+        self.cpu_stats = None
+
+    def valid(self):
+        return self.headers != None and self.disk_stats != None and self.ps_stats != None and self.cpu_stats != None
+
+
+_relevant_files = set(["header", "proc_diskstats.log", "proc_ps.log", "proc_stat.log"])
+
+def _do_parse(state, name, file):
+    if name == "header":
+        state.headers = _parse_headers(file)
+    elif name == "proc_diskstats.log":
+        state.disk_stats = _parse_proc_disk_stat_log(file, get_num_cpus(state.headers))
+    elif name == "proc_ps.log":
+        state.ps_stats = _parse_proc_ps_log(file)
+    elif name == "proc_stat.log":
+        state.cpu_stats = _parse_proc_stat_log(file)
+    return state
+
+def parse_file(state, filename):
+    basename = os.path.basename(filename)
+    if not(basename in _relevant_files):
+        return state
+    with open(filename, "rb") as file:
+        return _do_parse(state, basename, file)
+
+def parse_paths(state, paths):
+    for path in paths:
+        root,extension = os.path.splitext(path)
+        if not(os.path.exists(path)):
+            print "warning: path '%s' does not exist, ignoring." % path
+            continue
+        if os.path.isdir(path):
+            files = [ f for f in [os.path.join(path, f) for f in os.listdir(path)] if os.path.isfile(f) ]
+            files.sort()
+            state = parse_paths(state, files)
+        elif extension in [".tar", ".tgz", ".tar.gz"]:
+            tf = None
+            try:
+                tf = tarfile.open(path, 'r:*')
+                for name in tf.getnames():
+                    state = _do_parse(state, name, tf.extractfile(name))
+            except tarfile.ReadError, error:
+                raise ParseError("error: could not read tarfile '%s': %s." % (path, error))
+            finally:
+                if tf != None:
+                    tf.close()
+        else:
+            state = parse_file(state, path)
+    return state
+
+def parse(paths, prune):   
+    state = parse_paths(ParserState(), paths)
+    if not state.valid():
+        raise ParseError("empty state: '%s' does not contain a valid bootchart" % ", ".join(paths))
+    monitored_app = state.headers.get("profile.process")
+    proc_tree = ProcessTree(state.ps_stats, monitored_app, prune)
+    return (state.headers, state.cpu_stats, state.disk_stats, proc_tree)
diff --git a/scripts/pybootchartgui/pybootchartgui/process_tree.py b/scripts/pybootchartgui/pybootchartgui/process_tree.py
new file mode 100644
index 0000000000..bde29ebda8
--- /dev/null
+++ b/scripts/pybootchartgui/pybootchartgui/process_tree.py
@@ -0,0 +1,270 @@
+class ProcessTree:
+    """ProcessTree encapsulates a process tree.  The tree is built from log files
+       retrieved during the boot process.  When building the process tree, it is
+       pruned and merged in order to be able to visualize it in a comprehensible
+       manner.
+
+       The following pruning techniques are used:
+
+        * idle processes that keep running during the last process sample
+          (which is a heuristic for a background processes) are removed,
+        * short-lived processes (i.e. processes that only live for the
+          duration of two samples or less) are removed,
+        * the processes used by the boot logger are removed,
+        * exploders (i.e. processes that are known to spawn huge meaningless
+          process subtrees) have their subtrees merged together,
+        * siblings (i.e. processes with the same command line living
+          concurrently -- thread heuristic) are merged together,
+        * process runs (unary trees with processes sharing the command line)
+          are merged together.
+
+    """
+    LOGGER_PROC = 'bootchartd'
+    EXPLODER_PROCESSES = set(['hwup'])
+
+    def __init__(self, psstats, monitoredApp, prune, for_testing = False):
+        self.process_tree = []
+        self.psstats = psstats
+        self.process_list = sorted(psstats.process_list, key = lambda p: p.pid)
+        self.sample_period = psstats.sample_period
+
+        self.build()
+        self.update_ppids_for_daemons(self.process_list)
+
+        self.start_time = self.get_start_time(self.process_tree)
+        self.end_time = self.get_end_time(self.process_tree)
+        self.duration = self.end_time - self.start_time
+
+        if for_testing:
+            return
+
+        # print 'proc_tree before prune: num_proc=%i, duration=%i' % (self.num_nodes(self.process_list), self.duration)
+
+        removed = self.merge_logger(self.process_tree, self.LOGGER_PROC, monitoredApp, False)
+        print "Merged %i logger processes" % removed
+
+        if prune:
+            removed = self.prune(self.process_tree, None)
+            print "Pruned %i processes" % removed
+            removed = self.merge_exploders(self.process_tree, self.EXPLODER_PROCESSES)
+            print "Pruned %i exploders" % removed
+            removed = self.merge_siblings(self.process_tree)
+            print "Pruned %i threads" % removed
+            removed = self.merge_runs(self.process_tree)
+            print "Pruned %i runs" % removed
+
+        self.sort(self.process_tree)
+
+        self.start_time = self.get_start_time(self.process_tree)
+        self.end_time = self.get_end_time(self.process_tree)
+        self.duration = self.end_time - self.start_time
+
+        self.num_proc = self.num_nodes(self.process_tree)
+
+    def build(self):
+        """Build the process tree from the list of top samples."""
+        self.process_tree = []
+        for proc in self.process_list:
+            if not proc.parent:
+                self.process_tree.append(proc)
+            else:
+                proc.parent.child_list.append(proc)
+
+    def sort(self, process_subtree):
+        """Sort process tree."""
+        for p in process_subtree:
+            p.child_list.sort(key = lambda p: p.pid)
+            self.sort(p.child_list)
+
+    def num_nodes(self, process_list):
+        "Counts the number of nodes in the specified process tree."""
+        nodes = 0
+        for proc in process_list:
+            nodes = nodes + self.num_nodes(proc.child_list)
+        return nodes + len(process_list)
+
+    def get_start_time(self, process_subtree):
+        """Returns the start time of the process subtree.  This is the start
+           time of the earliest process.
+
+        """
+        if not process_subtree:
+            return 100000000;
+        return min( [min(proc.start_time, self.get_start_time(proc.child_list)) for proc in process_subtree] )
+
+    def get_end_time(self, process_subtree):
+        """Returns the end time of the process subtree.  This is the end time
+           of the last collected sample.
+
+        """
+        if not process_subtree:
+            return -100000000;
+        return max( [max(proc.start_time + proc.duration, self.get_end_time(proc.child_list)) for proc in process_subtree] )
+
+    def get_max_pid(self, process_subtree):
+        """Returns the max PID found in the process tree."""
+        if not process_subtree:
+            return -100000000;
+        return max( [max(proc.pid, self.get_max_pid(proc.child_list)) for proc in process_subtree] )
+
+    def update_ppids_for_daemons(self, process_list):
+        """Fedora hack: when loading the system services from rc, runuser(1)
+           is used.  This sets the PPID of all daemons to 1, skewing
+           the process tree.  Try to detect this and set the PPID of
+           these processes the PID of rc.
+
+        """
+        rcstartpid = -1
+        rcendpid = -1
+        rcproc = None
+        for p in process_list:
+            if p.cmd == "rc" and p.ppid == 1:
+                rcproc = p
+                rcstartpid = p.pid
+                rcendpid = self.get_max_pid(p.child_list)
+        if rcstartpid != -1 and rcendpid != -1:
+            for p in process_list:
+                if p.pid > rcstartpid and p.pid < rcendpid and p.ppid == 1:
+                    p.ppid = rcstartpid
+                    p.parent = rcproc
+            for p in process_list:
+                p.child_list = []
+            self.build()
+            
+    def prune(self, process_subtree, parent):
+        """Prunes the process tree by removing idle processes and processes
+           that only live for the duration of a single top sample.  Sibling
+           processes with the same command line (i.e. threads) are merged 
+           together. This filters out sleepy background processes, short-lived
+           processes and bootcharts' analysis tools.
+        """
+        def is_idle_background_process_without_children(p):
+            process_end = p.start_time + p.duration
+            return not p.active and \
+                   process_end >= self.start_time + self.duration and \
+                   p.start_time > self.start_time and \
+                   p.duration > 0.9 * self.duration and \
+                   self.num_nodes(p.child_list) == 0
+
+        num_removed = 0
+        idx = 0
+        while idx < len(process_subtree):
+            p = process_subtree[idx]
+            if parent != None or len(p.child_list) == 0:
+
+                prune = False
+                if is_idle_background_process_without_children(p):
+                    prune = True
+                elif p.duration <= 2 * self.sample_period:
+                    # short-lived process
+                    prune = True
+
+                if prune:
+                    process_subtree.pop(idx)
+                    for c in p.child_list:
+                        process_subtree.insert(idx, c)
+                    num_removed += 1
+                    continue
+                else:
+                    num_removed += self.prune(p.child_list, p)
+            else:
+                num_removed += self.prune(p.child_list, p)
+            idx += 1
+
+        return num_removed
+
+    def merge_logger(self, process_subtree, logger_proc, monitored_app, app_tree):
+        """Merges the logger's process subtree.  The logger will typically
+           spawn lots of sleep and cat processes, thus polluting the
+           process tree.
+
+        """
+        num_removed = 0
+        for p in process_subtree:
+            is_app_tree = app_tree
+            if logger_proc == p.cmd and not app_tree:
+                is_app_tree = True
+                num_removed += self.merge_logger(p.child_list, logger_proc, monitored_app, is_app_tree)
+                # don't remove the logger itself
+                continue
+
+            if app_tree and monitored_app != None and monitored_app == p.cmd:
+                is_app_tree = False
+
+            if is_app_tree:
+                for child in p.child_list:
+                    self.__merge_processes(p, child)
+                    num_removed += 1
+                p.child_list = []
+            else:
+                num_removed += self.merge_logger(p.child_list, logger_proc, monitored_app, is_app_tree)
+        return num_removed
+
+    def merge_exploders(self, process_subtree, processes):
+        """Merges specific process subtrees (used for processes which usually
+           spawn huge meaningless process trees).
+
+        """
+        num_removed = 0
+        for p in process_subtree:
+            if processes in processes and len(p.child_list) > 0:
+                subtreemap = self.getProcessMap(p.child_list)
+                for child in subtreemap.values():
+                    self.__merge_processes(p, child)
+                    num_removed += len(subtreemap)
+                    p.child_list = []
+                    p.cmd += " (+)"
+            else:
+                num_removed += self.merge_exploders(p.child_list, processes)
+        return num_removed
+
+    def merge_siblings(self,process_subtree):
+        """Merges thread processes.  Sibling processes with the same command
+           line are merged together.
+           
+        """
+        num_removed = 0
+        idx = 0
+        while idx < len(process_subtree)-1:
+            p = process_subtree[idx]
+            nextp = process_subtree[idx+1]
+            if nextp.cmd == p.cmd:
+                process_subtree.pop(idx+1)
+                idx -= 1
+                num_removed += 1
+                p.child_list.extend(nextp.child_list)
+                self.__merge_processes(p, nextp)
+            num_removed += self.merge_siblings(p.child_list)
+            idx += 1
+        if len(process_subtree) > 0:
+            p = process_subtree[-1]
+            num_removed += self.merge_siblings(p.child_list)
+        return num_removed
+
+    def merge_runs(self, process_subtree):
+        """Merges process runs.  Single child processes which share the same
+           command line with the parent are merged.
+
+        """
+        num_removed = 0
+        idx = 0
+        while idx < len(process_subtree):
+            p = process_subtree[idx]
+            if len(p.child_list) == 1 and p.child_list[0].cmd == p.cmd:
+                child = p.child_list[0]
+                p.child_list = list(child.child_list)
+                self.__merge_processes(p, child)
+                num_removed += 1
+                continue
+            num_removed += self.merge_runs(p.child_list)
+            idx += 1
+        return num_removed
+
+    def __merge_processes(self, p1, p2):
+        """Merges two process samples."""
+        p1.samples.extend(p2.samples)
+        p1time = p1.start_time
+        p2time = p2.start_time
+        p1.start_time = min(p1time, p2time)
+        pendtime = max(p1time + p1.duration, p2time + p2.duration)
+        p1.duration = pendtime - p1.start_time
diff --git a/scripts/pybootchartgui/pybootchartgui/samples.py b/scripts/pybootchartgui/pybootchartgui/samples.py
new file mode 100644
index 0000000000..c94b30d032
--- /dev/null
+++ b/scripts/pybootchartgui/pybootchartgui/samples.py
@@ -0,0 +1,93 @@
+class DiskStatSample:
+        def __init__(self, time):
+                self.time = time
+                self.diskdata = [0, 0, 0]
+        def add_diskdata(self, new_diskdata):
+                self.diskdata = [ a + b for a, b in zip(self.diskdata, new_diskdata) ]
+
+class CPUSample:
+        def __init__(self, time, user, sys, io):
+                self.time = time
+                self.user = user
+                self.sys = sys
+                self.io = io
+
+        def __str__(self):
+                return str(self.time) + "\t" + str(self.user) + "\t" + str(self.sys) + "\t" + str(self.io);
+                
+class ProcessSample:
+        def __init__(self, time, state, cpu_sample):
+                self.time = time
+                self.state = state
+                self.cpu_sample = cpu_sample
+                
+        def __str__(self):
+                return str(self.time) + "\t" + str(self.state) + "\t" + str(self.cpu_sample);
+
+class ProcessStats:
+    def __init__(self, process_list, sample_period, start_time, end_time):
+                self.process_list = process_list
+                self.sample_period = sample_period
+                self.start_time = start_time
+                self.end_time = end_time
+
+class Process:  
+        def __init__(self, pid, cmd, ppid, start_time):
+                self.pid = pid
+                self.cmd = cmd.strip('(').strip(')')
+                self.ppid = ppid
+                self.start_time = start_time
+                self.samples = []
+                self.parent = None
+                self.child_list = []
+                
+                self.duration = 0
+                self.active = None
+                
+                self.last_user_cpu_time = None
+                self.last_sys_cpu_time = None
+        
+        def __str__(self):
+                return " ".join([str(self.pid), self.cmd, str(self.ppid), '[ ' + str(len(self.samples)) + ' samples ]' ])
+        
+        def calc_stats(self, samplePeriod):
+                if self.samples:
+                        firstSample = self.samples[0]
+                        lastSample = self.samples[-1]
+                        self.start_time = min(firstSample.time, self.start_time)
+                        self.duration = lastSample.time - self.start_time + samplePeriod
+                        
+                activeCount = sum( [1 for sample in self.samples if sample.cpu_sample and sample.cpu_sample.sys + sample.cpu_sample.user + sample.cpu_sample.io > 0.0] )
+                activeCount = activeCount + sum( [1 for sample in self.samples if sample.state == 'D'] )
+                self.active = (activeCount>2)
+                
+        def calc_load(self, userCpu, sysCpu, interval):
+                
+                userCpuLoad = float(userCpu - self.last_user_cpu_time) / interval
+                sysCpuLoad = float(sysCpu - self.last_sys_cpu_time) / interval
+                cpuLoad = userCpuLoad + sysCpuLoad
+                # normalize
+                if cpuLoad > 1.0:
+                        userCpuLoad = userCpuLoad / cpuLoad;
+                        sysCpuLoad = sysCpuLoad / cpuLoad;
+                return (userCpuLoad, sysCpuLoad)
+        
+        def set_parent(self, processMap):
+                if self.ppid != None:
+                        self.parent = processMap.get(self.ppid)
+                        if self.parent == None and self.pid > 1:
+                                print "warning: no parent for pid '%i' with ppid '%i'" % (self.pid,self.ppid)
+        def get_end_time(self):
+                return self.start_time + self.duration
+
+class DiskSample:
+        def __init__(self, time, read, write, util):
+                self.time = time
+                self.read = read
+                self.write = write
+                self.util = util
+                self.tput = read + write
+
+        def __str__(self):
+                return "\t".join([str(self.time), str(self.read), str(self.write), str(self.util)])
+
diff --git a/scripts/pybootchartgui/pybootchartgui/tests/parser_test.py b/scripts/pybootchartgui/pybootchartgui/tests/parser_test.py
new file mode 100644
index 0000000000..574c2c7a2b
--- /dev/null
+++ b/scripts/pybootchartgui/pybootchartgui/tests/parser_test.py
@@ -0,0 +1,93 @@
+import sys, os, re, struct, operator, math
+from collections import defaultdict
+import unittest
+
+sys.path.insert(0, os.getcwd())
+
+import parsing
+
+debug = False
+
+def floatEq(f1, f2):
+        return math.fabs(f1-f2) < 0.00001
+
+class TestBCParser(unittest.TestCase):
+    
+        def setUp(self):
+                self.name = "My first unittest"
+                self.rootdir = '../examples/1'
+
+        def mk_fname(self,f):
+                return os.path.join(self.rootdir, f)
+
+        def testParseHeader(self):
+                state = parsing.parse_file(parsing.ParserState(), self.mk_fname('header'))
+                self.assertEqual(6, len(state.headers))
+                self.assertEqual(2, parsing.get_num_cpus(state.headers))
+
+        def test_parseTimedBlocks(self):
+                state = parsing.parse_file(parsing.ParserState(), self.mk_fname('proc_diskstats.log'))
+                self.assertEqual(141, len(state.disk_stats))            
+
+        def testParseProcPsLog(self):
+                state = parsing.parse_file(parsing.ParserState(), self.mk_fname('proc_ps.log'))
+                samples = state.ps_stats
+                processes = samples.process_list
+                sorted_processes = sorted(processes, key=lambda p: p.pid )
+                
+                for index, line in enumerate(open(self.mk_fname('extract2.proc_ps.log'))):
+                        tokens = line.split();
+                        process = sorted_processes[index]
+                        if debug:       
+                                print tokens[0:4]
+                                print process.pid, process.cmd, process.ppid, len(process.samples)
+                                print '-------------------'
+                        
+                        self.assertEqual(tokens[0], str(process.pid))
+                        self.assertEqual(tokens[1], str(process.cmd))
+                        self.assertEqual(tokens[2], str(process.ppid))
+                        self.assertEqual(tokens[3], str(len(process.samples)))
+        
+
+        def testparseProcDiskStatLog(self):
+                state_with_headers = parsing.parse_file(parsing.ParserState(), self.mk_fname('header'))
+                state_with_headers.headers['system.cpu'] = 'xxx (2)'
+                samples = parsing.parse_file(state_with_headers, self.mk_fname('proc_diskstats.log')).disk_stats
+                self.assertEqual(141, len(samples))
+        
+                for index, line in enumerate(open(self.mk_fname('extract.proc_diskstats.log'))):
+                        tokens = line.split('\t')
+                        sample = samples[index]
+                        if debug:               
+                                print line.rstrip(), 
+                                print sample
+                                print '-------------------'
+                        
+                        self.assertEqual(tokens[0], str(sample.time))
+                        self.assert_(floatEq(float(tokens[1]), sample.read))
+                        self.assert_(floatEq(float(tokens[2]), sample.write))
+                        self.assert_(floatEq(float(tokens[3]), sample.util))
+        
+        def testparseProcStatLog(self):
+                samples = parsing.parse_file(parsing.ParserState(), self.mk_fname('proc_stat.log')).cpu_stats
+                self.assertEqual(141, len(samples))
+                        
+                for index, line in enumerate(open(self.mk_fname('extract.proc_stat.log'))):
+                        tokens = line.split('\t')
+                        sample = samples[index]
+                        if debug:
+                                print line.rstrip()
+                                print sample
+                                print '-------------------'
+                        self.assert_(floatEq(float(tokens[0]), sample.time))
+                        self.assert_(floatEq(float(tokens[1]), sample.user))
+                        self.assert_(floatEq(float(tokens[2]), sample.sys))
+                        self.assert_(floatEq(float(tokens[3]), sample.io))
+        
+        def testParseLogDir(self):              
+                res = parsing.parse([self.rootdir], False)              
+                self.assertEqual(4, len(res))
+        
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/scripts/pybootchartgui/pybootchartgui/tests/process_tree_test.py b/scripts/pybootchartgui/pybootchartgui/tests/process_tree_test.py
new file mode 100644
index 0000000000..971e125eab
--- /dev/null
+++ b/scripts/pybootchartgui/pybootchartgui/tests/process_tree_test.py
@@ -0,0 +1,78 @@
+import sys
+import os
+import unittest
+
+sys.path.insert(0, os.getcwd())
+
+import parsing
+import process_tree
+
+class TestProcessTree(unittest.TestCase):
+
+    def setUp(self):
+        self.name = "Process tree unittest"
+        self.rootdir = '../examples/1'
+        self.ps_stats = parsing.parse_file(parsing.ParserState(), self.mk_fname('proc_ps.log')).ps_stats
+        self.processtree = process_tree.ProcessTree(self.ps_stats, None, False, for_testing = True)
+
+    def mk_fname(self,f):
+        return os.path.join(self.rootdir, f)
+
+    def flatten(self, process_tree):
+        flattened = []
+        for p in process_tree:
+            flattened.append(p)
+            flattened.extend(self.flatten(p.child_list))
+        return flattened
+
+    def checkAgainstJavaExtract(self, filename, process_tree):
+        for expected, actual in zip(open(filename), self.flatten(process_tree)):
+            tokens = expected.split('\t')
+            self.assertEqual(int(tokens[0]), actual.pid)
+            self.assertEqual(tokens[1], actual.cmd)
+            self.assertEqual(long(tokens[2]), 10 * actual.start_time)
+            self.assert_(long(tokens[3]) - 10 * actual.duration < 5, "duration")
+            self.assertEqual(int(tokens[4]), len(actual.child_list))
+            self.assertEqual(int(tokens[5]), len(actual.samples))
+
+    def testBuild(self):
+        process_tree = self.processtree.process_tree
+        self.checkAgainstJavaExtract(self.mk_fname('extract.processtree.1.log'), process_tree)
+
+    def testMergeLogger(self):
+        self.processtree.merge_logger(self.processtree.process_tree, 'bootchartd', None, False)
+        process_tree = self.processtree.process_tree
+        self.checkAgainstJavaExtract(self.mk_fname('extract.processtree.2.log'), process_tree)
+
+    def testPrune(self):
+        self.processtree.merge_logger(self.processtree.process_tree, 'bootchartd', None, False)
+        self.processtree.prune(self.processtree.process_tree, None)
+        process_tree = self.processtree.process_tree
+        self.checkAgainstJavaExtract(self.mk_fname('extract.processtree.3b.log'), process_tree)
+
+    def testMergeExploders(self):
+        self.processtree.merge_logger(self.processtree.process_tree, 'bootchartd', None, False)
+        self.processtree.prune(self.processtree.process_tree, None)
+        self.processtree.merge_exploders(self.processtree.process_tree, set(['hwup']))
+        process_tree = self.processtree.process_tree
+        self.checkAgainstJavaExtract(self.mk_fname('extract.processtree.3c.log'), process_tree)
+
+    def testMergeSiblings(self):
+        self.processtree.merge_logger(self.processtree.process_tree, 'bootchartd', None, False)
+        self.processtree.prune(self.processtree.process_tree, None)
+        self.processtree.merge_exploders(self.processtree.process_tree, set(['hwup']))
+        self.processtree.merge_siblings(self.processtree.process_tree)
+        process_tree = self.processtree.process_tree
+        self.checkAgainstJavaExtract(self.mk_fname('extract.processtree.3d.log'), process_tree)
+
+    def testMergeRuns(self):
+        self.processtree.merge_logger(self.processtree.process_tree, 'bootchartd', None, False)
+        self.processtree.prune(self.processtree.process_tree, None)
+        self.processtree.merge_exploders(self.processtree.process_tree, set(['hwup']))
+        self.processtree.merge_siblings(self.processtree.process_tree)
+        self.processtree.merge_runs(self.processtree.process_tree)
+        process_tree = self.processtree.process_tree
+        self.checkAgainstJavaExtract(self.mk_fname('extract.processtree.3e.log'), process_tree)
+
+if __name__ == '__main__':
+    unittest.main()